diff --git a/[refs] b/[refs]
index e88aa10a5675..261e4196a001 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26c2143b63b8078d08d562733716de142927e17a
+refs/heads/master: 39f4885c56073ecafd482d7e10dd7b17900fa312
diff --git a/trunk/include/linux/cpu.h b/trunk/include/linux/cpu.h
index cdfe471a70a1..a3caf6866bae 100644
--- a/trunk/include/linux/cpu.h
+++ b/trunk/include/linux/cpu.h
@@ -79,6 +79,8 @@ extern int lock_cpu_hotplug_interruptible(void);
 		{ .notifier_call = fn, .priority = pri };	\
 	register_cpu_notifier(&fn##_nb);			\
 }
+#define register_hotcpu_notifier(nb)	register_cpu_notifier(nb)
+#define unregister_hotcpu_notifier(nb)	unregister_cpu_notifier(nb)
 int cpu_down(unsigned int cpu);
 #define cpu_is_offline(cpu) unlikely(!cpu_online(cpu))
 #else
@@ -86,6 +88,8 @@ int cpu_down(unsigned int cpu);
 #define unlock_cpu_hotplug()	do { } while (0)
 #define lock_cpu_hotplug_interruptible() 0
 #define hotcpu_notifier(fn, pri)
+#define register_hotcpu_notifier(nb)
+#define unregister_hotcpu_notifier(nb)
 
 /* CPUs don't go offline once they're online w/o CONFIG_HOTPLUG_CPU */
 static inline int cpu_is_offline(int cpu) { return 0; }