Re: Linux 2.5.51

[Matthew Dobson <colpatch@us.ibm.com>]

[-- Attachment #1: Type: text/plain, Size: 346 bytes --]

Linus,
	This patch (from wli & myself) was overlooked for 2.5.51.  Without this 
fix, sysfs panics when registering topology for NUMA boxen.  Please add 
this to your bk tree.

[mcd@arrakis push]$ diffstat topo_ordering-2.5.51.patch
  memblk.c |    4 ++--
  node.c   |    4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)

Cheers!

-Matt

[-- Attachment #2: topo_ordering-2.5.51.patch --]
[-- Type: text/plain, Size: 1160 bytes --]

diff -Nur --exclude-from=/usr/src/.dontdiff linux-2.5.51-vanilla/drivers/base/memblk.c linux-2.5.51-topo_ordering/drivers/base/memblk.c
--- linux-2.5.51-vanilla/drivers/base/memblk.c	Mon Dec  9 18:46:26 2002
+++ linux-2.5.51-topo_ordering/drivers/base/memblk.c	Wed Dec 11 16:36:31 2002
@@ -49,7 +49,7 @@
 
 static int __init register_memblk_type(void)
 {
-	driver_register(&memblk_driver);
-	return devclass_register(&memblk_devclass);
+	int error = devclass_register(&memblk_devclass);
+	return error ? error : driver_register(&memblk_driver);
 }
 postcore_initcall(register_memblk_type);
diff -Nur --exclude-from=/usr/src/.dontdiff linux-2.5.51-vanilla/drivers/base/node.c linux-2.5.51-topo_ordering/drivers/base/node.c
--- linux-2.5.51-vanilla/drivers/base/node.c	Mon Dec  9 18:45:44 2002
+++ linux-2.5.51-topo_ordering/drivers/base/node.c	Wed Dec 11 16:36:06 2002
@@ -93,7 +93,7 @@
 
 static int __init register_node_type(void)
 {
-	devclass_register(&node_devclass);
-	return driver_register(&node_driver);
+	int error = devclass_register(&node_devclass);
+	return error ? error : driver_register(&node_driver);
 }
 postcore_initcall(register_node_type);