rpms/kernel/devel linux-2.6.15-cell-numa-init.patch, NONE, 1.1 kernel-2.6.spec, 1.1846, 1.1847

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21293

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6.15-cell-numa-init.patch 
Log Message:
Fix cell boot

linux-2.6.15-cell-numa-init.patch:
 setup.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE linux-2.6.15-cell-numa-init.patch ---
--- linux-2.6.15/arch/powerpc/platforms/cell/setup.c~	2006-01-12 20:23:46.000000000 +0000
+++ linux-2.6.15/arch/powerpc/platforms/cell/setup.c	2006-01-13 00:17:51.000000000 +0000
@@ -126,6 +126,7 @@ static void __init cell_spuprop_present(
 static void __init cell_spumem_init(int early)
 {
 	struct device_node *node;
+	return;
 	for (node = of_find_node_by_type(NULL, "spe");
 			node; node = of_find_node_by_type(node, "spe")) {
 		cell_spuprop_present(node, "local-store", early);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1846
retrieving revision 1.1847
diff -u -r1.1846 -r1.1847
--- kernel-2.6.spec	12 Jan 2006 23:52:50 -0000	1.1846
+++ kernel-2.6.spec	13 Jan 2006 00:22:43 -0000	1.1847
@@ -224,6 +224,7 @@
 
 # 300 - 399   ppc(64)
 Patch300: linux-2.6.15-default-powerpc.patch
+Patch301: linux-2.6.15-cell-numa-init.patch
 Patch304: linux-2.6.15-mv643xx-fixes.patch
 Patch305: linux-2.6-cell-mambo-drivers.patch
 Patch306: linux-2.6-hvc-console.patch
@@ -619,6 +620,8 @@
 #
 # Default to ARCH=powerpc
 %patch300 -p1
+# Arnd says don't call cell_spumem_init() till he fixes it.
+%patch301 -p1
 # Fix the MV643xx Gigabit Ethernet driver
 %patch304 -p1
 # Support the IBM Mambo simulator; core as well as disk and network drivers.
@@ -1346,6 +1349,9 @@
 %endif
 
 %changelog
+* Fri Jan 13 2006 David Woodhouse <dwmw2 at redhat.com>
+- Fix oops on Cell Broadband Engine with NUMA enabled.
+
 * Thu Jan 12 2006 Dave Jones <davej at redhat.com>
 - 2.6.15-git8