diff options
author | Zhang Rui <rui.zhang@intel.com> | 2019-03-18 17:37:44 +0300 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2019-03-18 17:37:44 +0300 |
commit | 2d7c4e17811f766321b9c054609551fa40f0b445 (patch) | |
tree | 8ff9a27b5771a4a618192ee7f3aba4fee5db8213 /drivers/thermal/intel/intel_powerclamp.c | |
parent | fb4d83f293e072ad96848959d20664e2a9f2235b (diff) | |
parent | e925b5be5751f6a7286bbd9a4cbbc4ac90cc5fa6 (diff) | |
download | linux-2d7c4e17811f766321b9c054609551fa40f0b445.tar.xz |
Merge branches 'fixes' and 'thermal-intel' into next
Diffstat (limited to 'drivers/thermal/intel/intel_powerclamp.c')
-rw-r--r-- | drivers/thermal/intel/intel_powerclamp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/intel/intel_powerclamp.c b/drivers/thermal/intel/intel_powerclamp.c index b12ecd436e23..ac7256b5f020 100644 --- a/drivers/thermal/intel/intel_powerclamp.c +++ b/drivers/thermal/intel/intel_powerclamp.c @@ -494,7 +494,7 @@ static void start_power_clamp_worker(unsigned long cpu) struct powerclamp_worker_data *w_data = per_cpu_ptr(worker_data, cpu); struct kthread_worker *worker; - worker = kthread_create_worker_on_cpu(cpu, 0, "kidle_inject/%ld", cpu); + worker = kthread_create_worker_on_cpu(cpu, 0, "kidle_inj/%ld", cpu); if (IS_ERR(worker)) return; |