Merge samba.org:/scratch/anton/linux-2.5_ppc64

into samba.org:/scratch/anton/sfr

arch/ppc64/Kconfig

@@ -187,9 +187,6 @@ config BINFMT_ELF
 	  executables used across different architectures and operating
 	  systems.
 
-config BINFMT_ELF32
-	tristate "Kernel support for 32-bit ELF binaries"
-
 config BINFMT_MISC
 	tristate "Kernel support for MISC binaries"
 	---help---

arch/ppc64/kernel/binfmt_elf32.c

@@ -74,12 +74,6 @@ extern void start_thread32(struct pt_regs *, unsigned long, unsigned long);
 #define init_elf_binfmt init_elf32_binfmt
 
 #undef CONFIG_BINFMT_ELF
-#ifdef CONFIG_BINFMT_ELF32
-#define CONFIG_BINFMT_ELF CONFIG_BINFMT_ELF32
-#endif
-#undef CONFIG_BINFMT_ELF_MODULE
-#ifdef CONFIG_BINFMT_ELF32_MODULE
-#define CONFIG_BINFMT_ELF_MODULE CONFIG_BINFMT_ELF32_MODULE
-#endif
+#define CONFIG_BINFMT_ELF 1
 
 #include "../../../fs/binfmt_elf.c"

arch/ppc64/kernel/entry.S

@@ -102,7 +102,6 @@ _GLOBAL(DoSyscall)
  * Need to vector to 32 Bit or default sys_call_table here,
  * based on caller's run-mode / personality.
  */
-#ifdef CONFIG_BINFMT_ELF32
 	andi.	r11,r10,_TIF_32BIT
 	beq-	15f
 	ld	r10,.SYS_CALL_TABLE32@toc(2)
@@ -118,7 +117,6 @@ _GLOBAL(DoSyscall)
 	clrldi	r8,r8,32
 	b	17f
 15:
-#endif
 	ld	r10,.SYS_CALL_TABLE@toc(2)
 17:	slwi	r0,r0,3
 	ldx	r10,r10,r0	/* Fetch system call handler [ptr] */
@@ -171,7 +169,6 @@ _GLOBAL(ret_from_syscall_1)
  * Need to vector to 32 Bit or default sys_call_table here,
  * based on caller's run-mode / personality.
  */
-#ifdef CONFIG_BINFMT_ELF32
 	clrrdi	r10,r1,THREAD_SHIFT
 	ld	r10,TI_FLAGS(r10)
 	andi.	r11,r10,_TIF_32BIT
@@ -189,7 +186,6 @@ _GLOBAL(ret_from_syscall_1)
 	clrldi	r8,r8,32
 	b	57f
 55:
-#endif
 	ld	r10,.SYS_CALL_TABLE@toc(2)
 57:
 	slwi	r0,r0,3

arch/ppc64/kernel/misc.S

@@ -499,7 +499,6 @@ SYSCALL(dup)
 SYSCALL(execve)
 SYSCALL(waitpid)
 
-#ifdef CONFIG_BINFMT_ELF32
 /* Why isn't this a) automatic, b) written in 'C'? */	
 	.balign 8
 _GLOBAL(sys_call_table32)
@@ -747,7 +746,6 @@ _GLOBAL(sys_call_table32)
 	.rept NR_syscalls-239
 		.llong .sys_ni_syscall
 	.endr
-#endif
 
 	.balign 8
 _GLOBAL(sys_call_table)