[PATCH] removal of bogus CONFIG_BINFMT_ELF uses

	We never use CONFIG_BINFTM_ELF and CONFIG_BINFMT_ELF_MODULE
anywhere in the source (they are used in makefiles, obviously).
32bit-emulation binfmt_elf_... in arch/* still define those guys
even though it hadn't been needed for years.

	Junk removed.

PS: BTW, CONFIG_BINFMT_ELF32 _is_ used in several places in arch/mips and it
looks like they really want
#if defined(CONFIG_BINFMT_ELF32) || defined(CONFIG_BINFMT_ELF32_MODULE)
in these ifdefs, but that's a separate story...

arch/ia64/ia32/binfmt_elf32.c

@@ -21,8 +21,6 @@
 #include "ia32priv.h"
 #include "elfcore32.h"
 
-#define CONFIG_BINFMT_ELF32
-
 /* Override some function names */
 #undef start_thread
 #define start_thread			ia32_start_thread
@@ -30,16 +28,6 @@
 #define init_elf_binfmt			init_elf32_binfmt
 #define exit_elf_binfmt			exit_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
-
 #undef CLOCKS_PER_SEC
 #define CLOCKS_PER_SEC	IA32_CLOCKS_PER_SEC
 

arch/mips/kernel/binfmt_elfn32.c

@@ -110,15 +110,6 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
 
 #define ELF_CORE_EFLAGS EF_MIPS_ABI2
 
-#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
-
 MODULE_DESCRIPTION("Binary format loader for compatibility with n32 Linux/MIPS binaries");
 MODULE_AUTHOR("Ralf Baechle (ralf@linux-mips.org)");
 

arch/mips/kernel/binfmt_elfo32.c

@@ -130,15 +130,6 @@ void elf32_core_copy_regs(elf_gregset_t _dest, struct pt_regs *_regs)
 	_dest[i++] = (elf_greg_t) _regs->cp0_cause;
 }
 
-#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
-
 MODULE_DESCRIPTION("Binary format loader for compatibility with o32 Linux/MIPS binaries");
 MODULE_AUTHOR("Ralf Baechle (ralf@linux-mips.org)");
 

arch/ppc64/kernel/binfmt_elf32.c

@@ -73,7 +73,4 @@ extern void start_thread32(struct pt_regs *, unsigned long, unsigned long);
 #define start_thread start_thread32
 #define init_elf_binfmt init_elf32_binfmt
 
-#undef CONFIG_BINFMT_ELF
-#define CONFIG_BINFMT_ELF 1
-
 #include "../../../fs/binfmt_elf.c"

arch/s390/kernel/binfmt_elf32.c

@@ -162,14 +162,6 @@ struct elf_prpsinfo32
 /*
 #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
 
 #undef start_thread
 #define start_thread                    start_thread31 

arch/sparc64/kernel/binfmt_elf32.c

@@ -144,14 +144,6 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
 #undef start_thread
 #define start_thread start_thread32
 #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
 
 MODULE_DESCRIPTION("Binary format loader for compatibility with 32bit SparcLinux binaries on the Ultra");
 MODULE_AUTHOR("Eric Youngdale, David S. Miller, Jakub Jelinek");

arch/x86_64/ia32/ia32_binfmt.c

@@ -272,16 +272,6 @@ do {							\
 
 #define load_elf_binary load_elf32_binary
 
-#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 ELF_PLAT_INIT(r, load_addr)	elf32_init(r)
 #define setup_arg_pages(bprm)		ia32_setup_arg_pages(bprm)
 int ia32_setup_arg_pages(struct linux_binprm *bprm);