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/acpi_memhotplug.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/acpi_memhotplug.c')
-rw-r--r-- | drivers/acpi/acpi_memhotplug.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 5f1127ad5a95..2b773160e9c2 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c | |||
@@ -194,8 +194,7 @@ acpi_memory_get_device(acpi_handle handle, | |||
194 | 194 | ||
195 | static int acpi_memory_check_device(struct acpi_memory_device *mem_device) | 195 | static int acpi_memory_check_device(struct acpi_memory_device *mem_device) |
196 | { | 196 | { |
197 | unsigned long current_status; | 197 | unsigned long long current_status; |
198 | |||
199 | 198 | ||
200 | /* Get device present/absent information from the _STA */ | 199 | /* Get device present/absent information from the _STA */ |
201 | if (ACPI_FAILURE(acpi_evaluate_integer(mem_device->device->handle, "_STA", | 200 | if (ACPI_FAILURE(acpi_evaluate_integer(mem_device->device->handle, "_STA", |
@@ -264,7 +263,7 @@ static int acpi_memory_powerdown_device(struct acpi_memory_device *mem_device) | |||
264 | acpi_status status; | 263 | acpi_status status; |
265 | struct acpi_object_list arg_list; | 264 | struct acpi_object_list arg_list; |
266 | union acpi_object arg; | 265 | union acpi_object arg; |
267 | unsigned long current_status; | 266 | unsigned long long current_status; |
268 | 267 | ||
269 | 268 | ||
270 | /* Issue the _EJ0 command */ | 269 | /* Issue the _EJ0 command */ |