diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-10-16 13:04:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-10-16 13:04:34 +0200 |
| commit | 4d69f155d58d0f75c5404ea502178b1943a04755 (patch) | |
| tree | fe5b7608f05f6951fce748ea1e93d942b52902bd /arch/x86/kernel/acpi/cstate.c | |
| parent | c474e50711aa79b7bd0ea30b44744baca5650375 (diff) | |
| parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
| download | talos-op-linux-4d69f155d58d0f75c5404ea502178b1943a04755.tar.gz talos-op-linux-4d69f155d58d0f75c5404ea502178b1943a04755.zip | |
Merge tag 'v4.9-rc1' into x86/fpu, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/acpi/cstate.c')
| -rw-r--r-- | arch/x86/kernel/acpi/cstate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c index bdfad642123f..af15f4444330 100644 --- a/arch/x86/kernel/acpi/cstate.c +++ b/arch/x86/kernel/acpi/cstate.c @@ -152,7 +152,7 @@ int acpi_processor_ffh_cstate_probe(unsigned int cpu, } EXPORT_SYMBOL_GPL(acpi_processor_ffh_cstate_probe); -void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cx) +void __cpuidle acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cx) { unsigned int cpu = smp_processor_id(); struct cstate_entry *percpu_entry; |
