[CHELSIO]: Fix skb->dev setting.

[pandora-kernel.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 45e86c7..18f397c 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -26,6 +26,18 @@ config MMU
        bool
        default y
 
+config GENERIC_CMOS_UPDATE
+       def_bool y
+
+config GENERIC_TIME
+       def_bool y
+
+config GENERIC_TIME_VSYSCALL
+       def_bool y
+
+config GENERIC_CLOCKEVENTS
+       def_bool y
+
 config GENERIC_HARDIRQS
        bool
        default y
@@ -161,6 +173,7 @@ config HIGHMEM
        bool "High memory support"
        depends on PPC32
 
+source kernel/time/Kconfig
 source kernel/Kconfig.hz
 source kernel/Kconfig.preempt
 source "fs/Kconfig.binfmt"
@@ -185,6 +198,17 @@ config MATH_EMULATION
          unit, which will allow programs that use floating-point
          instructions to run.
 
+config 8XX_MINIMAL_FPEMU
+       bool "Minimal math emulation for 8xx"
+       depends on 8xx && !MATH_EMULATION
+       help
+         Older arch/ppc kernels still emulated a few floating point
+         instructions such as load and store, even when full math
+         emulation is disabled.  Say "Y" here if you want to preserve
+         this behavior.
+
+         It is recommended that you build a soft-float userspace instead.
+
 config IOMMU_VMERGE
        bool "Enable IOMMU virtual merging"
        depends on PPC64
@@ -271,6 +295,7 @@ config ARCH_FLATMEM_ENABLE
 config ARCH_SPARSEMEM_ENABLE
        def_bool y
        depends on PPC64
+       select SPARSEMEM_VMEMMAP_ENABLE
 
 config ARCH_SPARSEMEM_DEFAULT
        def_bool y
@@ -471,7 +496,7 @@ config PCI_8260
 
 config 8260_PCI9
        bool "Enable workaround for MPC826x erratum PCI 9"
-       depends on PCI_8260 && !ADS8272
+       depends on PCI_8260 && !8272
        default y
 
 choice
@@ -575,7 +600,8 @@ config TASK_SIZE_BOOL
 
 config TASK_SIZE
        hex "Size of user task space" if TASK_SIZE_BOOL
-       default "0x80000000"
+       default "0x80000000" if PPC_PREP || PPC_8xx
+       default "0xc0000000"
 
 config CONSISTENT_START_BOOL
        bool "Set custom consistent memory pool address"
@@ -587,6 +613,7 @@ config CONSISTENT_START_BOOL
 
 config CONSISTENT_START
        hex "Base virtual address of consistent memory pool" if CONSISTENT_START_BOOL
+       default "0xfd000000" if (NOT_COHERENT_CACHE && 8xx)
        default "0xff100000" if NOT_COHERENT_CACHE
 
 config CONSISTENT_SIZE_BOOL
@@ -642,21 +669,7 @@ source "arch/powerpc/sysdev/qe_lib/Kconfig"
 
 source "lib/Kconfig"
 
-menu "Instrumentation Support"
-       depends on EXPERIMENTAL
-
-source "arch/powerpc/oprofile/Kconfig"
-
-config KPROBES
-       bool "Kprobes"
-       depends on !BOOKE && !4xx && KALLSYMS && 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/powerpc/Kconfig.debug"
 
@@ -672,3 +685,7 @@ source "crypto/Kconfig"
 config PPC_CLOCK
        bool
        default n
+
+config PPC_LIB_RHEAP
+       bool
+