1 files changed, 6 insertions, 6 deletions

diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 94ae3c87d828..14261fee5f4d 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -118,11 +118,11 @@ struct cpu_cache_info {
         struct kobject kobj;
 };
 
-static struct cpu_cache_info    all_cpu_cache_info[NR_CPUS];
+static struct cpu_cache_info    all_cpu_cache_info[NR_CPUS] __cpuinitdata;
 #define LEAF_KOBJECT_PTR(x,y)    (&all_cpu_cache_info[x].cache_leaves[y])
 
 #ifdef CONFIG_SMP
-static void cache_shared_cpu_map_setup( unsigned int cpu,
+static void __cpuinit cache_shared_cpu_map_setup( unsigned int cpu,
                 struct cache_info * this_leaf)
 {
         pal_cache_shared_info_t csi;
@@ -157,7 +157,7 @@ static void cache_shared_cpu_map_setup( unsigned int cpu,
                                 &csi) == PAL_STATUS_SUCCESS);
 }
 #else
-static void cache_shared_cpu_map_setup(unsigned int cpu,
+static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu,
                 struct cache_info * this_leaf)
 {
         cpu_set(cpu, this_leaf->shared_cpu_map);
@@ -428,13 +428,13 @@ static struct notifier_block __cpuinitdata cache_cpu_notifier =
         .notifier_call = cache_cpu_callback
 };
 
-static int __cpuinit cache_sysfs_init(void)
+static int __init cache_sysfs_init(void)
 {
         int i;
 
         for_each_online_cpu(i) {
-                cache_cpu_callback(&cache_cpu_notifier, CPU_ONLINE,
-                                (void *)(long)i);
+                struct sys_device *sys_dev = get_cpu_sysdev((unsigned int)i);
+                cache_add_dev(sys_dev);
         }
 
         register_hotcpu_notifier(&cache_cpu_notifier);