aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-08-06 10:09:52 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-08-06 10:09:52 +0200
commit6ccbe1dcdd17c9b76cc9f63e2dc600b381cb2378 (patch)
treea8646238f65a0fe67da955e670cc003e6a8e6344 /kernel
parentcpufreq: intel_pstate: Limit the scope of HWP dynamic boost platforms (diff)
parentMerge back cpufreq material for 4.19. (diff)
downloadlinux-dev-6ccbe1dcdd17c9b76cc9f63e2dc600b381cb2378.tar.xz
linux-dev-6ccbe1dcdd17c9b76cc9f63e2dc600b381cb2378.zip
Merge back cpufreq changes for 4.19.
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cpu.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 0db8938fbb23..307486baa477 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -290,6 +290,12 @@ void cpus_read_lock(void)
}
EXPORT_SYMBOL_GPL(cpus_read_lock);
+int cpus_read_trylock(void)
+{
+ return percpu_down_read_trylock(&cpu_hotplug_lock);
+}
+EXPORT_SYMBOL_GPL(cpus_read_trylock);
+
void cpus_read_unlock(void)
{
percpu_up_read(&cpu_hotplug_lock);