diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-06 11:57:19 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-06 11:57:19 +0200 |
| commit | 1bb025f6db789ea0bb674eaed15ee843ef0b2e88 (patch) | |
| tree | cdbaa7f57ce541abb5b973803712a9f55307c355 /arch/x86/kernel/cpu/powerflags.c | |
| parent | Linux 4.6-rc1 (diff) | |
| parent | extcon: palmas: Drop stray IRQF_EARLY_RESUME flag (diff) | |
| download | linux-1bb025f6db789ea0bb674eaed15ee843ef0b2e88.tar.xz linux-1bb025f6db789ea0bb674eaed15ee843ef0b2e88.zip | |
Merge tag 'extcon-fixes-for-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus
Chanwoo writes:
Update extcon for v4.6-rc3
This patch fixes the following one issue:
- In extcon-palmas.c, the external abort happen when wake-up from suspend state
on BeagleBoard-X15 platform. So, drop the IRQF_EARLY_RESUME flag.
Diffstat (limited to 'arch/x86/kernel/cpu/powerflags.c')
| -rw-r--r-- | arch/x86/kernel/cpu/powerflags.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/powerflags.c b/arch/x86/kernel/cpu/powerflags.c index 31f0f335ed22..1dd8294fd730 100644 --- a/arch/x86/kernel/cpu/powerflags.c +++ b/arch/x86/kernel/cpu/powerflags.c @@ -18,4 +18,6 @@ const char *const x86_power_flags[32] = { "", /* tsc invariant mapped to constant_tsc */ "cpb", /* core performance boost */ "eff_freq_ro", /* Readonly aperf/mperf */ + "proc_feedback", /* processor feedback interface */ + "acc_power", /* accumulated power mechanism */ }; |