diff options
author | Matthew Wilcox <willy@linux.intel.com> | 2008-10-10 02:22:59 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-11 02:47:33 -0400 |
commit | 27663c5855b10af9ec67bc7dfba001426ba21222 (patch) | |
tree | 2b8c520bb57a792045d7d072398a4d840fada6c0 /drivers/acpi/bus.c | |
parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) |
ACPI: Change acpi_evaluate_integer to support 64-bit on 32-bit kernels
As of version 2.0, ACPI can return 64-bit integers. The current
acpi_evaluate_integer only supports 64-bit integers on 64-bit platforms.
Change the argument to take a pointer to an acpi_integer so we support
64-bit integers on all platforms.
lenb: replaced use of "acpi_integer" with "unsigned long long"
lenb: fixed bug in acpi_thermal_trips_update()
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/bus.c')
-rw-r--r-- | drivers/acpi/bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index ccae305ee55d..0885fc796fa0 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
@@ -77,7 +77,7 @@ EXPORT_SYMBOL(acpi_bus_get_device); | |||
77 | int acpi_bus_get_status(struct acpi_device *device) | 77 | int acpi_bus_get_status(struct acpi_device *device) |
78 | { | 78 | { |
79 | acpi_status status = AE_OK; | 79 | acpi_status status = AE_OK; |
80 | unsigned long sta = 0; | 80 | unsigned long long sta = 0; |
81 | 81 | ||
82 | 82 | ||
83 | if (!device) | 83 | if (!device) |
@@ -155,7 +155,7 @@ int acpi_bus_get_power(acpi_handle handle, int *state) | |||
155 | int result = 0; | 155 | int result = 0; |
156 | acpi_status status = 0; | 156 | acpi_status status = 0; |
157 | struct acpi_device *device = NULL; | 157 | struct acpi_device *device = NULL; |
158 | unsigned long psc = 0; | 158 | unsigned long long psc = 0; |
159 | 159 | ||
160 | 160 | ||
161 | result = acpi_bus_get_device(handle, &device); | 161 | result = acpi_bus_get_device(handle, &device); |