diff options
| author | Bob Moore <robert.moore@intel.com> | 2009-02-18 14:52:43 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-03-26 16:38:28 -0400 |
| commit | 4f70e371cdf6ab4f988fbaf2257e6259422ba662 (patch) | |
| tree | 79ca9b7ad4c63def51c5892d0997956294c19e5d | |
| parent | 3371c19c294a4cb3649aa4e84606be8a1d999e61 (diff) | |
| download | kernel_samsung_aries-4f70e371cdf6ab4f988fbaf2257e6259422ba662.zip kernel_samsung_aries-4f70e371cdf6ab4f988fbaf2257e6259422ba662.tar.gz kernel_samsung_aries-4f70e371cdf6ab4f988fbaf2257e6259422ba662.tar.bz2 | |
ACPICA: Conditionally compile acpi_set_firmware_waking_vector64
This function is only needed on 64-bit host operating systems.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/acpica/hwsleep.c | 5 | ||||
| -rw-r--r-- | include/acpi/acpixf.h | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c index 51868f4..26e249e 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c @@ -90,6 +90,7 @@ acpi_set_firmware_waking_vector(u32 physical_address) ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector) +#if ACPI_MACHINE_WIDTH == 64 /******************************************************************************* * * FUNCTION: acpi_set_firmware_waking_vector64 @@ -100,7 +101,8 @@ ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector) * RETURN: Status * * DESCRIPTION: Sets the 64-bit X_firmware_waking_vector field of the FACS, if - * it exists in the table. + * it exists in the table. This function is intended for use with + * 64-bit host operating systems. * ******************************************************************************/ acpi_status @@ -124,6 +126,7 @@ acpi_set_firmware_waking_vector64(u64 physical_address) } ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector64) +#endif /******************************************************************************* * diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 8f9df62..e10c896 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -351,11 +351,11 @@ acpi_status acpi_get_register_unlocked(u32 register_id, u32 *return_value); acpi_status acpi_set_register(u32 register_id, u32 value); -acpi_status -acpi_set_firmware_waking_vector(u32 physical_address); +acpi_status acpi_set_firmware_waking_vector(u32 physical_address); -acpi_status -acpi_set_firmware_waking_vector64(u64 physical_address); +#if ACPI_MACHINE_WIDTH == 64 +acpi_status acpi_set_firmware_waking_vector64(u64 physical_address); +#endif acpi_status acpi_read(u32 *value, struct acpi_generic_address *reg); |