diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-03 11:10:55 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-03 11:10:55 -0800 |
| commit | 9b133b6207826ae8cbe5f7de0b407253191e98fa (patch) | |
| tree | 250eaae3c221ef7db71b3b18ccc1935ad273ec2b /include/linux | |
| parent | b82fdb62ee3caa1d07f47930cf54f1996fa50fd2 (diff) | |
| parent | a34f0e8a2f8976f0bae4962edf2af4dd16cb85f7 (diff) | |
Merge tag 'v4.4.39' into android-4.4.y
This is the 4.4.39 stable release
Change-Id: I36dd900bb57846dbbcd7b274774f1debef0f1f18
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpu.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 7c73824def83..1c95ef5a6ed9 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -131,22 +131,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) -#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 int __register_cpu_notifier(struct notifier_block *nb); extern void unregister_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); -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) +#define __cpu_notifier(fn, pri) do { (void)(fn); } while (0) + static inline int register_cpu_notifier(struct notifier_block *nb) { return 0; @@ -156,7 +150,6 @@ static inline int __register_cpu_notifier(struct notifier_block *nb) { return 0; } -#endif static inline void unregister_cpu_notifier(struct notifier_block *nb) { |