Commit 4f70e371 authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Conditionally compile acpi_set_firmware_waking_vector64 



This function is only needed on 64-bit host operating systems.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 3371c19c

drivers/acpi/acpica/hwsleep.c

+4 −1
Original line number Diff line number Diff line
@@ -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



/*******************************************************************************

 *

include/acpi/acpixf.h

+4 −4
Original line number Diff line number Diff line
@@ -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);