vserver 1.9.5.x5

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

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 6a4adf9..8527fab 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -20,6 +20,10 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
+config GENERIC_CALIBRATE_DELAY
+       bool
+       default y
+
 config GENERIC_ISA_DMA
        bool
        default y
@@ -80,6 +84,16 @@ config PPC_PMAC
        select ADB_PMU
        select U3_DART
 
+config PPC_MAPLE
+       depends on PPC_MULTIPLATFORM
+       bool "  Maple 970FX Evaluation Board"
+       select U3_DART
+       select MPIC_BROKEN_U3
+       default n
+       help
+          This option enables support for the Maple 970FX Evaluation Board.
+         For more informations, refer to <http://www.970eval.com>
+
 config PPC
        bool
        default y
@@ -110,11 +124,21 @@ config PPC_SPLPAR
          processors, that is, which share physical processors between
          two or more partitions.
 
+config IBMVIO
+       depends on PPC_PSERIES || PPC_ISERIES
+       bool
+       default y
+
 config U3_DART
        bool 
        depends on PPC_MULTIPLATFORM
        default n
 
+config MPIC_BROKEN_U3
+       bool
+       depends on PPC_MAPLE
+       default y
+
 config PPC_PMAC64
        bool
        depends on PPC_PMAC
@@ -162,14 +186,6 @@ config SMP
 
          If you don't know what to do here, say Y.
 
-config IRQ_ALL_CPUS
-       bool "Distribute interrupts on all CPUs by default"
-       depends on SMP && PPC_MULTIPLATFORM
-       help
-         This option gives the kernel permission to distribute IRQs across
-         multiple CPUs.  Saying N here will route all IRQs to the first
-         CPU.
-
 config NR_CPUS
        int "Maximum number of CPUs (2-128)"
        range 2 128
@@ -207,6 +223,29 @@ config PREEMPT
          Say Y here if you are building a kernel for a desktop, embedded
          or real-time system.  Say N if you are unsure.
 
+config PREEMPT_BKL
+       bool "Preempt The Big Kernel Lock"
+       depends on PREEMPT
+       default y
+       help
+         This option reduces the latency of the kernel by making the
+         big kernel lock preemptible.
+
+         Say Y here if you are building a kernel for a desktop system.
+         Say N if you are unsure.
+
+config EEH
+       bool "PCI Extended Error Handling (EEH)" if EMBEDDED
+       depends on PPC_PSERIES
+       default y if !EMBEDDED
+
+#
+# Use the generic interrupt handling code in kernel/irq/:
+#
+config GENERIC_HARDIRQS
+       bool
+       default y
+
 config MSCHUNKS
        bool
        depends on PPC_ISERIES
@@ -274,7 +313,8 @@ source "drivers/pci/Kconfig"
 
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"
-       depends on SMP && HOTPLUG && EXPERIMENTAL && PPC_PSERIES
+       depends on SMP && EXPERIMENTAL && PPC_PSERIES
+       select HOTPLUG
        ---help---
          Say Y here to be able to turn CPUs off and on.
 
@@ -351,6 +391,11 @@ source "kernel/vserver/Kconfig"
 
 source "security/Kconfig"
 
+config KEYS_COMPAT
+       bool
+       depends on COMPAT && KEYS
+       default y
+
 source "crypto/Kconfig"
 
 source "lib/Kconfig"