diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 14:49:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 14:49:25 -0800 |
| commit | e75080f185c103a638c66d7b65c673769a57cb87 (patch) | |
| tree | fa8678e324f7e2225b652685162c15c0c932f970 /fs/proc | |
| parent | f6705bf959efac87bca76d40050d342f1d212587 (diff) | |
| parent | 3e4c9e637df1fac4123db5f3165b0034226a671b (diff) | |
| download | linux-e75080f185c103a638c66d7b65c673769a57cb87.tar.gz linux-e75080f185c103a638c66d7b65c673769a57cb87.tar.bz2 linux-e75080f185c103a638c66d7b65c673769a57cb87.zip | |
Merge tag 'pm-fixes-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull two power management fixes from Rafael Wysocki:
"This is the change making /proc/cpuinfo on x86 report current CPU
frequency in "cpu MHz" again in all cases and an additional one
dealing with an overzealous check in one of the helper routines in the
runtime PM framework"
* tag 'pm-fixes-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / runtime: Drop children check from __pm_runtime_set_status()
x86 / CPU: Always show current CPU frequency in /proc/cpuinfo
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/cpuinfo.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/proc/cpuinfo.c b/fs/proc/cpuinfo.c index e0f867cd8553..96f1087e372c 100644 --- a/fs/proc/cpuinfo.c +++ b/fs/proc/cpuinfo.c @@ -1,12 +1,18 @@ // SPDX-License-Identifier: GPL-2.0 +#include <linux/cpufreq.h> #include <linux/fs.h> #include <linux/init.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> +__weak void arch_freq_prepare_all(void) +{ +} + extern const struct seq_operations cpuinfo_op; static int cpuinfo_open(struct inode *inode, struct file *file) { + arch_freq_prepare_all(); return seq_open(file, &cpuinfo_op); } |