Merge branches 'release', 'cpuidle-2.6.25' and 'idle' into release

[linux-2.6] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 59c4d752d286d5638e02e9e82e190c2b56457074..a8c6366f05a1b416ddbfd3a28c2e31b6d333a05d 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -8,6 +8,8 @@ mainmenu "Linux/UltraSPARC Kernel Configuration"
 config SPARC
        bool
        default y
 config SPARC
        bool
        default y

+       select HAVE_OPROFILE
+       select HAVE_KPROBES

 
 config SPARC64
        bool
 
 config SPARC64
        bool


@@ -66,12 +68,19 @@ config AUDIT_ARCH
        bool
        default y
 
        bool
        default y
 

+config HAVE_SETUP_PER_CPU_AREA
+       def_bool y
+

 config ARCH_NO_VIRT_TO_BUS
        def_bool y
 
 config OF
        def_bool y
 
 config ARCH_NO_VIRT_TO_BUS
        def_bool y
 
 config OF
        def_bool y
 

+config GENERIC_HARDIRQS_NO__DO_IRQ
+       bool
+       def_bool y
+

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


@@ -159,9 +168,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.
 


@@ -196,6 +204,11 @@ config US2E_FREQ
          If in doubt, say N.
 
 # Global things across all Sun machines.
          If in doubt, say N.
 
 # Global things across all Sun machines.

+config GENERIC_LOCKBREAK
+       bool
+       default y
+       depends on SMP && PREEMPT
+

 config RWSEM_GENERIC_SPINLOCK
        bool
 
 config RWSEM_GENERIC_SPINLOCK
        bool
 


@@ -339,11 +352,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
 


@@ -404,7 +412,7 @@ config SUNOS_EMUL
 
 config SOLARIS_EMUL
        tristate "Solaris binary emulation (EXPERIMENTAL)"
 
 config SOLARIS_EMUL
        tristate "Solaris binary emulation (EXPERIMENTAL)"

-       depends on SPARC32_COMPAT && EXPERIMENTAL
+       depends on SPARC32_COMPAT && NET && EXPERIMENTAL

        help
          This is experimental code which will enable you to run (many)
          Solaris binaries on your SPARC Linux machine.
        help
          This is experimental code which will enable you to run (many)
          Solaris binaries on your SPARC Linux machine.


@@ -456,25 +464,8 @@ source "drivers/Kconfig"
 
 source "drivers/sbus/char/Kconfig"
 
 
 source "drivers/sbus/char/Kconfig"
 

-source "drivers/fc4/Kconfig"
-

 source "fs/Kconfig"
 
 source "fs/Kconfig"
 

-menu "Instrumentation Support"
-
-source "arch/sparc64/oprofile/Kconfig"
-
-config KPROBES
-       bool "Kprobes (EXPERIMENTAL)"
-       depends on KALLSYMS && EXPERIMENTAL && MODULES
-       help
-         Kprobes allows you to trap at almost any kernel address and
-         execute a callback function.  register_kprobe() establishes
-         a probepoint and specifies the callback.  Kprobes is useful
-         for kernel debugging, non-intrusive instrumentation and testing.
-         If in doubt, say "N".
-endmenu
-

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