From: Chris Wright Date: Wed, 9 Nov 2005 23:53:08 +0000 (-0800) Subject: Add back ppc64 NUMA Kconfig patch now that it's rebased X-Git-Tag: v2.6.14.2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c217088aafff2b4834dfdd07fefd1d91185d666;p=thirdparty%2Fkernel%2Fstable-queue.git Add back ppc64 NUMA Kconfig patch now that it's rebased --- diff --git a/queue/ppc64-memory-model-depends-on-NUMA.patch b/queue/ppc64-memory-model-depends-on-NUMA.patch new file mode 100644 index 00000000000..eb55cbfbc70 --- /dev/null +++ b/queue/ppc64-memory-model-depends-on-NUMA.patch @@ -0,0 +1,50 @@ +From jschopp@austin.ibm.com Wed Nov 9 15:35:21 2005 +Date: Wed, 09 Nov 2005 17:35:02 -0600 +From: Joel Schopp +To: Chris Wright +CC: Greg KH , stable@kernel.org, + Andy Whitcroft +Subject: [PATCH] ppc64 memory model depends on NUMA + +Signed-off-by: Andy Whitcroft +Signed-off-by: Joel Schopp +Signed-off-by: Chris Wright +--- + +Index: 2.6.14-stable1/arch/ppc64/Kconfig +=================================================================== +--- 2.6.14-stable1.orig/arch/ppc64/Kconfig 2005-11-09 17:20:56.%N -0600 ++++ 2.6.14-stable1/arch/ppc64/Kconfig 2005-11-09 17:31:34.%N -0600 +@@ -234,6 +234,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 DISCONTIGMEM || SPARSEMEM ++ + config ARCH_SELECT_MEMORY_MODEL + def_bool y + +@@ -249,9 +253,6 @@ config ARCH_DISCONTIGMEM_DEFAULT + def_bool y + depends on ARCH_DISCONTIGMEM_ENABLE + +-config ARCH_FLATMEM_ENABLE +- def_bool y +- + config ARCH_SPARSEMEM_ENABLE + def_bool y + depends on ARCH_DISCONTIGMEM_ENABLE +@@ -274,10 +275,6 @@ config NODES_SPAN_OTHER_NODES + def_bool y + depends on NEED_MULTIPLE_NODES + +-config NUMA +- bool "NUMA support" +- default y if DISCONTIGMEM || SPARSEMEM +- + config SCHED_SMT + bool "SMT (Hyperthreading) scheduler support" + depends on SMP + diff --git a/queue/series b/queue/series new file mode 100644 index 00000000000..4a1a2e3ab8b --- /dev/null +++ b/queue/series @@ -0,0 +1 @@ +ppc64-memory-model-depends-on-NUMA.patch