[PATCH] ppc64: Convert NUMA to sparsemem (3)

[karo-tx-linux.git] / arch / ppc64 / Kconfig

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index e656e02d9dd16e0250e529fe35d8cdece65d84aa..9d10c12e87fee6863ae0e0567f43b1d9453aa90f 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -10,6 +10,9 @@ config MMU
        bool
        default y
 
+config PPC_STD_MMU
+       def_bool y
+
 config UID16
        bool
 
@@ -44,11 +47,16 @@ config ARCH_MAY_HAVE_PC_FDC
        bool
        default y
 
+config PPC_STD_MMU
+       bool
+       default y
+
 # We optimistically allocate largepages from the VM, so make the limit
 # large enough (16MB). This badly named config option is actually
 # max order + 1
 config FORCE_MAX_ZONEORDER
        int
+       default "9" if PPC_64K_PAGES
        default "13"
 
 source "init/Kconfig"
@@ -86,12 +94,14 @@ config PPC_PMAC
        bool "  Apple G5 based machines"
        default y
        select U3_DART
+       select GENERIC_TBSYNC
 
 config PPC_MAPLE
        depends on PPC_MULTIPLATFORM
        bool "  Maple 970FX Evaluation Board"
        select U3_DART
        select MPIC_BROKEN_U3
+       select GENERIC_TBSYNC
        default n
        help
           This option enables support for the Maple 970FX Evaluation Board.
@@ -120,6 +130,11 @@ config MPIC
        bool
        default y
 
+config PPC_I8259
+       depends on PPC_PSERIES
+       bool
+       default y
+
 config BPA_IIC
        depends on PPC_BPA
        bool
@@ -159,6 +174,16 @@ config KEXEC
          support.  As of this writing the exact hardware interface is
          strongly in flux, so no good recommendation can be made.
 
+source "drivers/cpufreq/Kconfig"
+
+config CPU_FREQ_PMAC64
+       bool "Support for some Apple G5s"
+       depends on CPU_FREQ && PMAC_SMU && PPC64
+       select CPU_FREQ_TABLE
+       help
+         This adds support for frequency switching on Apple iMac G5,
+         and some of the more recent desktop G5 machines as well.
+
 config IBMVIO
        depends on PPC_PSERIES || PPC_ISERIES
        bool
@@ -174,6 +199,9 @@ config MPIC_BROKEN_U3
        depends on PPC_MAPLE
        default y
 
+config GENERIC_TBSYNC
+       def_bool n
+
 config PPC_PMAC64
        bool
        depends on PPC_PMAC
@@ -189,6 +217,9 @@ config BOOTX_TEXT
 config POWER4
        def_bool y
 
+config PPC_FPU
+       def_bool y
+
 config POWER4_ONLY
        bool "Optimize for POWER4"
        default n
@@ -237,6 +268,10 @@ config HMT
          This option enables hardware multithreading on RS64 cpus.
          pSeries systems p620 and p660 have such a cpu type.
 
+config NUMA
+       bool "NUMA support"
+       default y if SMP && PPC_PSERIES
+
 config ARCH_SELECT_MEMORY_MODEL
        def_bool y
 
@@ -244,20 +279,12 @@ config ARCH_FLATMEM_ENABLE
        def_bool y
        depends on !NUMA
 
-config ARCH_DISCONTIGMEM_ENABLE
-       def_bool y
-       depends on SMP && PPC_PSERIES
-
-config ARCH_DISCONTIGMEM_DEFAULT
-       def_bool y
-       depends on ARCH_DISCONTIGMEM_ENABLE
-
-config ARCH_FLATMEM_ENABLE
+config ARCH_SPARSEMEM_ENABLE
        def_bool y
 
-config ARCH_SPARSEMEM_ENABLE
+config ARCH_SPARSEMEM_DEFAULT
        def_bool y
-       depends on ARCH_DISCONTIGMEM_ENABLE
+       depends on NUMA
 
 source "mm/Kconfig"
 
@@ -265,6 +292,10 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
        def_bool y
        depends on NEED_MULTIPLE_NODES
 
+config ARCH_MEMORY_PROBE
+       def_bool y
+       depends on MEMORY_HOTPLUG
+
 # Some NUMA nodes have memory ranges that span
 # other nodes.  Even though a pfn is valid and
 # between a node's start and end pfns, it may not
@@ -277,9 +308,14 @@ config NODES_SPAN_OTHER_NODES
        def_bool y
        depends on NEED_MULTIPLE_NODES
 
-config NUMA
-       bool "NUMA support"
-       default y if DISCONTIGMEM || SPARSEMEM
+config PPC_64K_PAGES
+       bool "64k page size"
+       help
+         This option changes the kernel logical page size to 64k. On machines
+          without processor support for 64k pages, the kernel will simulate
+          them by loading each individual 4k page on demand transparently,
+          while on hardware with such support, it will be used to map
+          normal application pages.
 
 config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
@@ -310,6 +346,11 @@ config PPC_RTAS
        depends on PPC_PSERIES || PPC_BPA
        default y
 
+config RTAS_ERROR_LOGGING
+       bool
+       depends on PPC_RTAS
+       default y
+
 config RTAS_PROC
        bool "Proc interface to RTAS"
        depends on PPC_RTAS