[SPARC64]: Fix sparse warnings in arch/sparc64/kernel/irq.c

[~andy/linux] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 73fc05d0bfad4aa9662bd27e5b63da23527800ae..3af378ddb6ae8008db5619074414b489165370a6 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -8,10 +8,13 @@ mainmenu "Linux/UltraSPARC Kernel Configuration"
 config SPARC
        bool
        default y
 config SPARC
        bool
        default y

+       select HAVE_OPROFILE
+       select HAVE_KPROBES

 
 config SPARC64
        bool
        default y
 
 config SPARC64
        bool
        default y

+       select HAVE_IDE

        help
          SPARC is a family of RISC microprocessors designed and marketed by
          Sun Microsystems, incorporated.  This port covers the newer 64-bit
        help
          SPARC is a family of RISC microprocessors designed and marketed by
          Sun Microsystems, incorporated.  This port covers the newer 64-bit


@@ -38,6 +41,10 @@ config MMU
        bool
        default y
 
        bool
        default y
 

+config IOMMU_HELPER
+       bool
+       default y
+

 config QUICKLIST
        bool
        default y
 config QUICKLIST
        bool
        default y


@@ -79,6 +86,9 @@ config GENERIC_HARDIRQS_NO__DO_IRQ
        bool
        def_bool y
 
        bool
        def_bool y
 

+config ARCH_SUPPORTS_AOUT
+       def_bool y
+

 choice
        prompt "Kernel page size"
        default SPARC64_PAGE_SIZE_8KB
 choice
        prompt "Kernel page size"
        default SPARC64_PAGE_SIZE_8KB


@@ -166,9 +176,8 @@ config SMP
          Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
          Management" code will be disabled if you say Y here.
 
          Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
          Management" code will be disabled if you say Y here.
 

-         See also the <file:Documentation/smp.txt>,
-         <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
-         <http://www.tldp.org/docs.html#howto>.
+         See also <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO
+         available at <http://www.tldp.org/docs.html#howto>.

 
          If you don't know what to do here, say N.
 
 
          If you don't know what to do here, say N.
 


@@ -351,11 +360,6 @@ config PCI
          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
          VESA. If you have PCI, say Y, otherwise N.
 
          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
          VESA. If you have PCI, say Y, otherwise N.
 

-         The PCI-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>, contains valuable
-         information about which PCI hardware does work under Linux and which
-         doesn't.
-

 config PCI_DOMAINS
        def_bool PCI
 
 config PCI_DOMAINS
        def_bool PCI
 


@@ -384,17 +388,11 @@ config COMPAT
        bool
        depends on SPARC32_COMPAT
        default y
        bool
        depends on SPARC32_COMPAT
        default y

-
-config BINFMT_ELF32
-       bool "Kernel support for 32-bit ELF binaries"
-       depends on SPARC32_COMPAT
-       help
-         This allows you to run 32-bit Linux/ELF binaries on your Ultra.
-         Everybody wants this; say Y.
+       select COMPAT_BINFMT_ELF

 
 config BINFMT_AOUT32
        bool "Kernel support for 32-bit (ie. SunOS) a.out binaries"
 
 config BINFMT_AOUT32
        bool "Kernel support for 32-bit (ie. SunOS) a.out binaries"

-       depends on SPARC32_COMPAT
+       depends on SPARC32_COMPAT && ARCH_SUPPORTS_AOUT

        help
          This allows you to run 32-bit a.out format binaries on your Ultra.
          If you want to run SunOS binaries (see SunOS binary emulation below)
        help
          This allows you to run 32-bit a.out format binaries on your Ultra.
          If you want to run SunOS binaries (see SunOS binary emulation below)


@@ -470,8 +468,6 @@ source "drivers/sbus/char/Kconfig"
 
 source "fs/Kconfig"
 
 
 source "fs/Kconfig"
 

-source "kernel/Kconfig.instrumentation"
-

 source "arch/sparc64/Kconfig.debug"
 
 source "security/Kconfig"
 source "arch/sparc64/Kconfig.debug"
 
 source "security/Kconfig"