1 files changed, 3 insertions, 5 deletions

diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index b146f1cfad31..f648c610b10c 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -67,10 +67,8 @@ static int __init topology_init(void)
 #endif
 
         sysfs_cpus = kzalloc(sizeof(struct ia64_cpu) * NR_CPUS, GFP_KERNEL);
-        if (!sysfs_cpus) {
-                err = -ENOMEM;
-                goto out;
-        }
+        if (!sysfs_cpus)
+                panic("kzalloc in topology_init failed - NR_CPUS too big?");
 
         for_each_present_cpu(i) {
                 if((err = arch_register_cpu(i)))
@@ -435,7 +433,7 @@ static int __cpuinit cache_sysfs_init(void)
                                 (void *)(long)i);
         }
 
-        register_cpu_notifier(&cache_cpu_notifier);
+        register_hotcpu_notifier(&cache_cpu_notifier);
 
         return 0;
 }