diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2013-10-31 09:31:18 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-31 14:37:35 +0100 |
| commit | 40bce100cafb945f1fb5475a70628b4379c74f38 (patch) | |
| tree | cc50d633bf086af087ebe6b873f558bdf088fa25 /arch/x86/kernel/acpi/wakeup_32.S | |
| parent | efb835429fff1488e4718138cdf5bc855a6762a4 (diff) | |
| download | talos-obmc-linux-40bce100cafb945f1fb5475a70628b4379c74f38.tar.gz talos-obmc-linux-40bce100cafb945f1fb5475a70628b4379c74f38.zip | |
ACPICA: Cleanup asmlinkage for ACPICA APIs.
Add an asmlinkage wrapper around acpi_enter_sleep_state() to prevent
an empty stub from being called by assmebly code for ACPI_REDUCED_HARDWARE
set.
As arch/x86/kernel/acpi/wakeup_xx.S is only compiled when CONFIG_ACPI=y
and there are no users of ACPI_HARDWARE_REDUCED, currently this is in
fact not a real issue, but a cleanup to reduce source code differences
between Linux and ACPICA upstream.
[rjw: Changelog]
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/x86/kernel/acpi/wakeup_32.S')
| -rw-r--r-- | arch/x86/kernel/acpi/wakeup_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S index d1daa66ab162..665c6b7d2ea9 100644 --- a/arch/x86/kernel/acpi/wakeup_32.S +++ b/arch/x86/kernel/acpi/wakeup_32.S @@ -73,7 +73,7 @@ ENTRY(do_suspend_lowlevel) call save_processor_state call save_registers pushl $3 - call acpi_enter_sleep_state + call x86_acpi_enter_sleep_state addl $4, %esp # In case of S3 failure, we'll emerge here. Jump |
