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 /arch/ia64/sn | |
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 'arch/ia64/sn')
-rw-r--r-- | arch/ia64/sn/kernel/io_acpi_init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/sn/kernel/io_acpi_init.c b/arch/ia64/sn/kernel/io_acpi_init.c index 6568942a95f0..a15baacaba43 100644 --- a/arch/ia64/sn/kernel/io_acpi_init.c +++ b/arch/ia64/sn/kernel/io_acpi_init.c | |||
@@ -232,7 +232,7 @@ exit: | |||
232 | static unsigned int | 232 | static unsigned int |
233 | get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle) | 233 | get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle) |
234 | { | 234 | { |
235 | unsigned long adr; | 235 | unsigned long long adr; |
236 | acpi_handle child; | 236 | acpi_handle child; |
237 | unsigned int devfn; | 237 | unsigned int devfn; |
238 | int function; | 238 | int function; |
@@ -292,8 +292,8 @@ get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle) | |||
292 | static acpi_status | 292 | static acpi_status |
293 | find_matching_device(acpi_handle handle, u32 lvl, void *context, void **rv) | 293 | find_matching_device(acpi_handle handle, u32 lvl, void *context, void **rv) |
294 | { | 294 | { |
295 | unsigned long bbn = -1; | 295 | unsigned long long bbn = -1; |
296 | unsigned long adr; | 296 | unsigned long long adr; |
297 | acpi_handle parent = NULL; | 297 | acpi_handle parent = NULL; |
298 | acpi_status status; | 298 | acpi_status status; |
299 | unsigned int devfn; | 299 | unsigned int devfn; |
@@ -348,7 +348,7 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info, | |||
348 | unsigned int host_devfn; | 348 | unsigned int host_devfn; |
349 | struct sn_pcidev_match pcidev_match; | 349 | struct sn_pcidev_match pcidev_match; |
350 | acpi_handle rootbus_handle; | 350 | acpi_handle rootbus_handle; |
351 | unsigned long segment; | 351 | unsigned long long segment; |
352 | acpi_status status; | 352 | acpi_status status; |
353 | 353 | ||
354 | rootbus_handle = PCI_CONTROLLER(dev)->acpi_handle; | 354 | rootbus_handle = PCI_CONTROLLER(dev)->acpi_handle; |