[PATCH] NUMA topology sysfs panic fix

This (from wli & myself) was overlooked for 2.5.51.  Without this fix,
sysfs panics when registering topology for NUMA boxen.

diff --git a/drivers/base/memblk.c b/drivers/base/memblk.c
index deed83fa40700b1a2bfae2565d31eeabcfc0bf56..bac6fb23508607ef25f5faf237f10734369af934 100644 (file)
--- a/drivers/base/memblk.c
+++ b/drivers/base/memblk.c
@@ -49,7 +49,7 @@ int __init register_memblk(struct memblk *memblk, int num, struct node *root)
 
 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 --git a/drivers/base/node.c b/drivers/base/node.c
index 815567bd72fe2e19767ff41515e142cc4366eb79..8196d30dad0dd5f6e157d952ac70a969124f84ee 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -93,7 +93,7 @@ int __init register_node(struct node *node, int num, struct node *parent)
 
 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);