diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-09-13 10:58:10 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-09-13 10:58:10 -0700 |
| commit | d380a7c16b7439df127c9f127acb3dca52fbbbce (patch) | |
| tree | b85535cbdd468050bbad4d5e749576994a3e88a2 /include/linux | |
| parent | b5939af1fd1e13b2a0e1f47f54a3891eb194c32a (diff) | |
| parent | da781e2b84b23ffade73c9998b709cf57a98dee4 (diff) | |
Merge "cgroup/cpuset: remove circular dependency deadlock"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h index a157a69097b5..a3bcdfbef9ca 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -234,6 +234,7 @@ extern struct bus_type cpu_subsys; extern void cpu_hotplug_begin(void); extern void cpu_hotplug_done(void); extern void get_online_cpus(void); +extern void cpu_hotplug_mutex_held(void); extern void put_online_cpus(void); extern void cpu_hotplug_disable(void); extern void cpu_hotplug_enable(void); @@ -256,6 +257,7 @@ static inline void cpu_hotplug_done(void) {} #define cpu_hotplug_enable() do { } while (0) #define hotcpu_notifier(fn, pri) do { (void)(fn); } while (0) #define __hotcpu_notifier(fn, pri) do { (void)(fn); } while (0) +#define cpu_hotplug_mutex_held() do { } while (0) /* These aren't inline functions due to a GCC bug. */ #define register_hotcpu_notifier(nb) ({ (void)(nb); 0; }) #define __register_hotcpu_notifier(nb) ({ (void)(nb); 0; }) |