[MIPS] Fix build after b0rked changes to <linux/init.h>.

[powerpc.git] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 2f22fa9..73fc05d 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -66,12 +66,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


@@ -196,6 +203,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
 


@@ -404,7 +416,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 +468,9 @@ 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"
-        depends on EXPERIMENTAL
-
-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 "kernel/Kconfig.instrumentation"

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