Merge tag 'v3.15-rc1' into perf/urgent

Pick up the latest fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 5 insertions, 1 deletions

diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index ca69a5a96dcc..f295f9abba4b 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -454,12 +454,16 @@ static int __init cache_sysfs_init(void)
 {
         int i;
 
+        cpu_notifier_register_begin();
+
         for_each_online_cpu(i) {
                 struct device *sys_dev = get_cpu_device((unsigned int)i);
                 cache_add_dev(sys_dev);
         }
 
-        register_hotcpu_notifier(&cache_cpu_notifier);
+        __register_hotcpu_notifier(&cache_cpu_notifier);
+
+        cpu_notifier_register_done();
 
         return 0;
 }