diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-27 22:26:44 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-27 22:26:44 +0200 |
| commit | a976c2951d8f376112361830aa7762beff83a205 (patch) | |
| tree | 24f6647aedd4b570cb67f3195962f5c8a040c824 /include/linux/workqueue.h | |
| parent | 83848fbe7e6af978c080a88c130a67178b1ac0e4 (diff) | |
| parent | 16b9951f656ea8f2b47546bd898325a7e256932f (diff) | |
Merge back ACPICA material for v4.13.
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 |