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>

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 46f0ddfb78e2f95e044bef273dbb8a2896ad1652..ee35226c44e94ff7fcedb0157016af8c4d08f781 100644 (file)
--- 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 8803c39112b622a09314c567f21342b2bc3a54cd..2f7ef54ef3ae3cab8ea7e7ca036283e396cbbce7 100644 (file)
--- 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 d42b996a24ad3bd5f9a896c9b55460c2e9c0dd33..41e5bf02e230716f860290555066df3d532440cb 100644 (file)
--- 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 2a44e5c0a3bebf16a35b2013cda433d97c3f7a21..1f57c113df6dab5d6816b829d994958c1ad657e4 100644 (file)
--- 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 2e8fa40b3cdfd5e7a60a3bda3823405f4d5615eb..59b1d65a85e9c736570227642cd215c664a4e030 100644 (file)
--- 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 e4df913025df7c8f701c2a7cce7b79e413db799e..17c9c5ec14c526fe0eddbf77e9771550bae6fbb8 100644 (file)
--- 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