diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-05-06 10:54:07 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-05-06 10:54:07 +0200 |
| commit | 4566e2dd4a12a0c0288e97a079dc4e1eed436800 (patch) | |
| tree | a50d4a1661f8fc1c20c1ea4ccfc3d133b5354c67 /include | |
| parent | Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | x86: tsc: Rework time_cpufreq_notifier() (diff) | |
| download | linux-4566e2dd4a12a0c0288e97a079dc4e1eed436800.tar.xz linux-4566e2dd4a12a0c0288e97a079dc4e1eed436800.zip | |
Merge branch 'pm-x86'
* pm-x86:
x86: tsc: Rework time_cpufreq_notifier()
admin-guide: pm: intel_epb: Add SPDX license tag and copyright notice
PM / arch: x86: MSR_IA32_ENERGY_PERF_BIAS sysfs interface
PM / arch: x86: Rework the MSR_IA32_ENERGY_PERF_BIAS handling
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpuhotplug.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index e78281d07b70..dbfdd0fadbef 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -147,6 +147,7 @@ enum cpuhp_state { CPUHP_AP_X86_VDSO_VMA_ONLINE, CPUHP_AP_IRQ_AFFINITY_ONLINE, CPUHP_AP_ARM_MVEBU_SYNC_CLOCKS, + CPUHP_AP_X86_INTEL_EPB_ONLINE, CPUHP_AP_PERF_ONLINE, CPUHP_AP_PERF_X86_ONLINE, CPUHP_AP_PERF_X86_UNCORE_ONLINE, |