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 (file)
index 0000000..eb55cbf
--- /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 <jschopp@austin.ibm.com>
+To: Chris Wright <chrisw@osdl.org>
+CC: Greg KH <greg@kroah.com>, stable@kernel.org,
+       Andy Whitcroft <apw@shadowen.org>
+Subject: [PATCH] ppc64 memory model depends on NUMA
+
+Signed-off-by: Andy Whitcroft <apw@shadowen.org>
+Signed-off-by: Joel Schopp <jschopp@austin.ibm.com>
+Signed-off-by: Chris Wright <chrisw@osdl.org>
+---
+
+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 (file)
index 0000000..4a1a2e3
--- /dev/null
+++ b/queue/series
@@ -0,0 +1 @@
+ppc64-memory-model-depends-on-NUMA.patch