Introduce HAVE_AOUT symbol to remove hard-coded arch list for BINFMT_AOUT

HAVE_AOUT doesn't quite do the same thing as the recently removed
ARCH_SUPPORTS_AOUT config option. That was set even on platforms where
binfmt_aout isn't supported, although it's not entirely clear why.

So it's best just to introduce a new symbol, handled consistently with
other similar HAVE_xxx symbols; with a simple 'select' in the arch Kconfig.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

6 files changed, 11 insertions, 3 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 46f0ddfb78e2..ee35226c44e9 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -5,6 +5,7 @@
 config ALPHA
         bool
         default y
+        select HAVE_AOUT
         select HAVE_IDE
         select HAVE_OPROFILE
         help
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8803c39112b6..2f7ef54ef3ae 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -8,6 +8,7 @@ mainmenu "Linux Kernel Configuration"
 config ARM
         bool
         default y
+        select HAVE_AOUT
         select HAVE_IDE
         select RTC_LIB
         select SYS_SUPPORTS_APM_EMULATION
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index d42b996a24ad..41e5bf02e230 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -5,6 +5,7 @@
 config M68K
         bool
         default y
+        select HAVE_AOUT
         select HAVE_IDE
 
 config MMU
diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386
index 2a44e5c0a3be..1f57c113df6d 100644
--- a/arch/um/Kconfig.i386
+++ b/arch/um/Kconfig.i386
@@ -9,8 +9,9 @@ config UML_X86
         default y
 
 config X86_32
-       bool
-       default y
+        bool
+        default y
+        select HAVE_AOUT
 
 config RWSEM_XCHGADD_ALGORITHM
         def_bool y
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 2e8fa40b3cdf..59b1d65a85e9 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -18,6 +18,7 @@ config X86_64
 ### Arch settings
 config X86
         def_bool y
+        select HAVE_AOUT if X86_32
         select HAVE_UNSTABLE_SCHED_CLOCK
         select HAVE_IDE
         select HAVE_OPROFILE
diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index e4df913025df..17c9c5ec14c5 100644
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -59,9 +59,12 @@ config BINFMT_SHARED_FLAT
         help
           Support FLAT shared libraries
 
+config HAVE_AOUT
+       def_bool n
+
 config BINFMT_AOUT
         tristate "Kernel support for a.out and ECOFF binaries"
-        depends on (X86_32 || ALPHA || ARM || M68K)
+        depends on HAVE_AOUT
         ---help---
           A.out (Assembler.OUTput) is a set of formats for libraries and
           executables used in the earliest versions of UNIX.  Linux used