VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / arch / ppc64 / Kconfig

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 8d5e077..e9431d8 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -198,7 +198,6 @@ config SCHED_SMT
 
 config PREEMPT
        bool "Preemptible Kernel"
 
 config PREEMPT
        bool "Preemptible Kernel"

-       depends on BROKEN

        help
          This option reduces the latency of the kernel when reacting to
          real-time or interactive events by allowing a low priority process to
        help
          This option reduces the latency of the kernel when reacting to
          real-time or interactive events by allowing a low priority process to


@@ -226,7 +225,7 @@ config SCANLOG
        depends on PPC_RTAS
 
 config LPARCFG
        depends on PPC_RTAS
 
 config LPARCFG

-       bool "LPAR Configuration Data"
+       tristate "LPAR Configuration Data"

        help
        Provide system capacity information via human readable 
        <key word>=<value> pairs through a /proc/ppc64/lparcfg interface.
        help
        Provide system capacity information via human readable 
        <key word>=<value> pairs through a /proc/ppc64/lparcfg interface.


@@ -425,8 +424,6 @@ config IRQSTACKS
          for handling hard and soft interrupts.  This can help avoid
          overflowing the process kernel stacks.
          
          for handling hard and soft interrupts.  This can help avoid
          overflowing the process kernel stacks.
          

-endmenu
-

 config SPINLINE
        bool "Inline spinlock code at each call site"
        depends on SMP && !PPC_SPLPAR && !PPC_ISERIES
 config SPINLINE
        bool "Inline spinlock code at each call site"
        depends on SMP && !PPC_SPLPAR && !PPC_ISERIES


@@ -437,6 +434,8 @@ config SPINLINE
 
          If in doubt, say N.
 
 
          If in doubt, say N.
 

+endmenu
+

 source "kernel/vserver/Kconfig"
 
 source "security/Kconfig"
 source "kernel/vserver/Kconfig"
 
 source "security/Kconfig"