Merge samba.org:/home/anton/ppc64/for-linus-ppc64-new

into samba.org:/home/anton/ppc64/for-linus-ppc64

arch/ppc64/Makefile

@@ -16,9 +16,9 @@
 KERNELLOAD	=0xc000000000000000
 
 LDFLAGS		:= -m elf64ppc
-ARCHBLOBLFLAGS	:= -I binary -O elf64-powerpc -B powerpc
 LDFLAGS_vmlinux	= -Bstatic \
 		-e $(KERNELLOAD) -Ttext $(KERNELLOAD)
+LDFLAGS_BLOB	:= --format binary --oformat elf64-powerpc
 CFLAGS		:= $(CFLAGS) -msoft-float -pipe \
 		-Wno-uninitialized -mminimal-toc -mtraceback=full \
 		-finline-limit-2000 -mcpu=power4

arch/ppc64/defconfig

@@ -102,7 +102,6 @@ CONFIG_CHR_DEV_ST=y
 # CONFIG_CHR_DEV_OSST is not set
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_SR_EXTRA_DEVS=2
 CONFIG_CHR_DEV_SG=y
 
 #
@@ -183,6 +182,7 @@ CONFIG_PACKET=y
 # CONFIG_NETFILTER is not set
 CONFIG_FILTER=y
 CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
@@ -193,6 +193,8 @@ CONFIG_NET_IPIP=y
 # CONFIG_ARPD is not set
 # CONFIG_INET_ECN is not set
 CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
 CONFIG_IPV6=m
 
 #
@@ -218,6 +220,11 @@ CONFIG_IPV6_SCTP__=y
 #
 # CONFIG_NET_SCHED is not set
 
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+
 #
 # Network device support
 #
@@ -455,10 +462,7 @@ CONFIG_RAMFS=y
 CONFIG_ISO9660_FS=y
 # CONFIG_JOLIET is not set
 # CONFIG_ZISOFS is not set
-CONFIG_JFS_FS=y
-# CONFIG_JFS_POSIX_ACL is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
+# CONFIG_JFS_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
@@ -476,6 +480,7 @@ CONFIG_EXT2_FS=y
 CONFIG_XFS_FS=y
 # CONFIG_XFS_RT is not set
 # CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
 
 #
 # Network File Systems
@@ -487,7 +492,7 @@ CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
 CONFIG_NFSD=y
 CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
+# CONFIG_NFSD_V4 is not set
 CONFIG_NFSD_TCP=y
 CONFIG_SUNRPC=y
 CONFIG_LOCKD=y

include/asm-ppc64/elf.h

@@ -57,9 +57,9 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 #define ELF_ET_DYN_BASE         (0x08000000)
 
 /* Common routine for both 32-bit and 64-bit processes */
-#define ELF_CORE_COPY_REGS(gregs, regs) elf_core_copy_regs(gregs, regs);
+#define ELF_CORE_COPY_REGS(gregs, regs) ppc64_elf_core_copy_regs(gregs, regs);
 static inline void
-elf_core_copy_regs(elf_gregset_t dstRegs, struct pt_regs* srcRegs)
+ppc64_elf_core_copy_regs(elf_gregset_t dstRegs, struct pt_regs* srcRegs)
 {
 	int i;