aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2009-02-18 01:52:43 -0500
committerLen Brown <len.brown@intel.com>2009-03-26 16:38:28 -0400
commit4f70e371cdf6ab4f988fbaf2257e6259422ba662 (patch)
tree79ca9b7ad4c63def51c5892d0997956294c19e5d
parent3371c19c294a4cb3649aa4e84606be8a1d999e61 (diff)
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.c5
-rw-r--r--include/acpi/acpixf.h8
2 files changed, 8 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index 51868f48159c..26e249e69ead 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)
90 90
91ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector) 91ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector)
92 92
93#if ACPI_MACHINE_WIDTH == 64
93/******************************************************************************* 94/*******************************************************************************
94 * 95 *
95 * FUNCTION: acpi_set_firmware_waking_vector64 96 * FUNCTION: acpi_set_firmware_waking_vector64
@@ -100,7 +101,8 @@ ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector)
100 * RETURN: Status 101 * RETURN: Status
101 * 102 *
102 * DESCRIPTION: Sets the 64-bit X_firmware_waking_vector field of the FACS, if 103 * DESCRIPTION: Sets the 64-bit X_firmware_waking_vector field of the FACS, if
103 * it exists in the table. 104 * it exists in the table. This function is intended for use with
105 * 64-bit host operating systems.
104 * 106 *
105 ******************************************************************************/ 107 ******************************************************************************/
106acpi_status 108acpi_status
@@ -124,6 +126,7 @@ acpi_set_firmware_waking_vector64(u64 physical_address)
124} 126}
125 127
126ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector64) 128ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector64)
129#endif
127 130
128/******************************************************************************* 131/*******************************************************************************
129 * 132 *
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 8f9df6235255..e10c89691043 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);
351 351
352acpi_status acpi_set_register(u32 register_id, u32 value); 352acpi_status acpi_set_register(u32 register_id, u32 value);
353 353
354acpi_status 354acpi_status acpi_set_firmware_waking_vector(u32 physical_address);
355acpi_set_firmware_waking_vector(u32 physical_address);
356 355
357acpi_status 356#if ACPI_MACHINE_WIDTH == 64
358acpi_set_firmware_waking_vector64(u64 physical_address); 357acpi_status acpi_set_firmware_waking_vector64(u64 physical_address);
358#endif
359 359
360acpi_status acpi_read(u32 *value, struct acpi_generic_address *reg); 360acpi_status acpi_read(u32 *value, struct acpi_generic_address *reg);
361 361