diff options
| author |   Brian Norris <computersforpeace@gmail.com> | 2017-05-15 11:19:19 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-05-15 11:19:19 -0700 |
| commit | c316cf670491def52a396d3bdc5a63ad01f7fefa (patch) | |
| tree | bf22299ce777088d190b532629b1bd647d28fab6 /include/linux/workqueue.h | |
| parent | mtd: physmap_of: Drop unnecessary static (diff) | |
| parent | Linux 4.12-rc1 (diff) | |
Merge 'v4.12-rc1' into MTD
Bring a few queued patches in sync for -next development.
Diffstat (limited to 'include/linux/workqueue.h')
| -rw-r--r-- | include/linux/workqueue.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index bde063cefd04..c102ef65cb64 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -608,8 +608,13 @@ static inline long work_on_cpu(int cpu, long (*fn)(void *), void *arg) { return fn(arg); } +static inline long work_on_cpu_safe(int cpu, long (*fn)(void *), void *arg) +{ + return fn(arg); +} #else long work_on_cpu(int cpu, long (*fn)(void *), void *arg); +long work_on_cpu_safe(int cpu, long (*fn)(void *), void *arg); #endif /* CONFIG_SMP */ #ifdef CONFIG_FREEZER |