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 /arch/x86/kernel/cpu/cpu.h | |
| parent | 5a28654cc0e616e129ea23d353d8bed5babb8b31 (diff) | |
| parent | c208ac8f8f862dba7b01eb54557f4803b3c17296 (diff) | |
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 'arch/x86/kernel/cpu/cpu.h')
| -rw-r--r-- | arch/x86/kernel/cpu/cpu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h index 5eb946b9a9f3..c0e2407abdd6 100644 --- a/arch/x86/kernel/cpu/cpu.h +++ b/arch/x86/kernel/cpu/cpu.h @@ -14,7 +14,6 @@ struct cpu_dev { void (*c_init)(struct cpuinfo_x86 *); void (*c_identify)(struct cpuinfo_x86 *); void (*c_detect_tlb)(struct cpuinfo_x86 *); - void (*c_bsp_resume)(struct cpuinfo_x86 *); int c_x86_vendor; #ifdef CONFIG_X86_32 /* Optional vendor specific routine to obtain the cache size. */ |