Pull osi-now into release branch

[mv-sheeva.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 8de5f9ff4ade1e8b36793ddb2f464c6d0113dc06..5eaeafd30bdfe2710b7e35f325fee9692b751d44 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -117,18 +117,9 @@ config GENERIC_BUG
        default y
        depends on BUG
 
-#
-# Powerpc uses the slab allocator to manage its ptes and the
-# page structs of ptes are used for splitting the page table
-# lock for configurations supporting more than SPLIT_PTLOCK_CPUS.
-#
-# In that special configuration the page structs of slabs are modified.
-# This setting disables the selection of SLUB as a slab allocator.
-#
-config ARCH_USES_SLAB_PAGE_STRUCT
+config SYS_SUPPORTS_APM_EMULATION
+       default y if PMAC_APM_EMU
        bool
-       default y
-       depends on SPLIT_PTLOCK_CPUS <= NR_CPUS
 
 config DEFAULT_UIMAGE
        bool
@@ -136,6 +127,11 @@ config DEFAULT_UIMAGE
          Used to allow a board to specify it wants a uImage built by default
        default n
 
+config PPC64_SWSUSP
+       bool
+       depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL))
+       default y
+
 menu "Processor support"
 choice
        prompt "Processor Type"
@@ -206,6 +202,7 @@ config 40x
 config 44x
        bool "AMCC 44x"
        select PPC_DCR_NATIVE
+       select WANT_DEVICE_TREE
 
 config E200
        bool "Freescale e200"
@@ -270,9 +267,14 @@ config PPC_OF_PLATFORM_PCI
        depends on PPC64 # not supported on 32 bits yet
        default n
 
+config 4xx
+       bool
+       depends on 40x || 44x
+       default y
+
 config BOOKE
        bool
-       depends on E200 || E500
+       depends on E200 || E500 || 44x
        default y
 
 config FSL_BOOKE
@@ -338,6 +340,11 @@ config PPC_STD_MMU_32
        def_bool y
        depends on PPC_STD_MMU && PPC32
 
+config PPC_MM_SLICES
+       bool
+       default y if HUGETLB_PAGE
+       default n
+
 config VIRT_CPU_ACCOUNTING
        bool "Deterministic task and CPU time accounting"
        depends on PPC64
@@ -383,6 +390,9 @@ config NOT_COHERENT_CACHE
        bool
        depends on 4xx || 8xx || E200
        default y
+
+config CONFIG_CHECK_CACHE_COHERENCY
+       bool
 endmenu
 
 source "init/Kconfig"
@@ -445,7 +455,7 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
 
 config KEXEC
        bool "kexec system call (EXPERIMENTAL)"
-       depends on PPC_MULTIPLATFORM && EXPERIMENTAL
+       depends on (PPC_PRPMC2800 || PPC_MULTIPLATFORM) && EXPERIMENTAL
        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot
@@ -527,9 +537,15 @@ config NODES_SPAN_OTHER_NODES
        def_bool y
        depends on NEED_MULTIPLE_NODES
 
+config PPC_HAS_HASH_64K
+       bool
+       depends on PPC64
+       default n
+
 config PPC_64K_PAGES
        bool "64k page size"
        depends on PPC64
+       select PPC_HAS_HASH_64K
        help
          This option changes the kernel logical page size to 64k. On machines
          without processor support for 64k pages, the kernel will simulate
@@ -669,11 +685,12 @@ config MCA
 config PCI
        bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
                || PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \
-               || MPC7448HPC2 || PPC_PS3
+               || MPC7448HPC2 || PPC_PS3 || PPC_HOLLY
        default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx \
                && !PPC_85xx && !PPC_86xx
        default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS
        default PCI_QSPAN if !4xx && !CPM2 && 8xx
+       select ARCH_SUPPORTS_MSI
        help
          Find out whether your system includes a PCI bus. PCI is the name of
          a bus system, i.e. the way the CPU talks to the other stuff inside