Re: Linux 2.5.51

From: Matthew Dobson (colpatch@us.ibm.com)
Date: Wed Dec 11 2002 - 19:40:49 EST


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

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);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sun Dec 15 2002 - 22:00:23 EST