Merge tag 'v3.10.106' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / cpu.h

diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 2d423ccf9a177b5079aa3bca92cb4bbb45ca4b71..233d049570fc9e31cecb3d33b4e2f8442d4fb5d9 100644 (file)
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -126,22 +126,16 @@ enum {
                { .notifier_call = fn, .priority = pri };       \
        register_cpu_notifier(&fn##_nb);                        \
 }
-#else /* #if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE) */
-#define cpu_notifier(fn, pri)  do { (void)(fn); } while (0)
-#endif /* #else #if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE) */
-#ifdef CONFIG_HOTPLUG_CPU
 extern int register_cpu_notifier(struct notifier_block *nb);
 extern void unregister_cpu_notifier(struct notifier_block *nb);
-#else
 
-#ifndef MODULE
-extern int register_cpu_notifier(struct notifier_block *nb);
-#else
+#else /* #if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE) */
+#define cpu_notifier(fn, pri)  do { (void)(fn); } while (0)
+
 static inline int register_cpu_notifier(struct notifier_block *nb)
 {
        return 0;
 }
-#endif
 
 static inline void unregister_cpu_notifier(struct notifier_block *nb)
 {