summaryrefslogtreecommitdiffstats
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
parent01e61a42a5d345a4c0205889498f0c9a0fb9ee8c (diff)
parent5a4c996764da496afcc470a6e13dc23a8f55aca8 (diff)
downloadlinux-6ccbe1dcdd17c9b76cc9f63e2dc600b381cb2378.tar.bz2
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);