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/pci_slot.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/pci_slot.c')
-rw-r--r-- | drivers/acpi/pci_slot.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c index d5b4ef898879..9bb84d4596be 100644 --- a/drivers/acpi/pci_slot.c +++ b/drivers/acpi/pci_slot.c | |||
@@ -76,10 +76,10 @@ static struct acpi_pci_driver acpi_pci_slot_driver = { | |||
76 | }; | 76 | }; |
77 | 77 | ||
78 | static int | 78 | static int |
79 | check_slot(acpi_handle handle, unsigned long *sun) | 79 | check_slot(acpi_handle handle, unsigned long long *sun) |
80 | { | 80 | { |
81 | int device = -1; | 81 | int device = -1; |
82 | unsigned long adr, sta; | 82 | unsigned long long adr, sta; |
83 | acpi_status status; | 83 | acpi_status status; |
84 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; | 84 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; |
85 | 85 | ||
@@ -132,7 +132,7 @@ static acpi_status | |||
132 | register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) | 132 | register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) |
133 | { | 133 | { |
134 | int device; | 134 | int device; |
135 | unsigned long sun; | 135 | unsigned long long sun; |
136 | char name[SLOT_NAME_SIZE]; | 136 | char name[SLOT_NAME_SIZE]; |
137 | struct acpi_pci_slot *slot; | 137 | struct acpi_pci_slot *slot; |
138 | struct pci_slot *pci_slot; | 138 | struct pci_slot *pci_slot; |
@@ -182,7 +182,7 @@ static acpi_status | |||
182 | walk_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv) | 182 | walk_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv) |
183 | { | 183 | { |
184 | int device, function; | 184 | int device, function; |
185 | unsigned long adr; | 185 | unsigned long long adr; |
186 | acpi_status status; | 186 | acpi_status status; |
187 | acpi_handle dummy_handle; | 187 | acpi_handle dummy_handle; |
188 | acpi_walk_callback user_function; | 188 | acpi_walk_callback user_function; |
@@ -239,7 +239,7 @@ static int | |||
239 | walk_root_bridge(acpi_handle handle, acpi_walk_callback user_function) | 239 | walk_root_bridge(acpi_handle handle, acpi_walk_callback user_function) |
240 | { | 240 | { |
241 | int seg, bus; | 241 | int seg, bus; |
242 | unsigned long tmp; | 242 | unsigned long long tmp; |
243 | acpi_status status; | 243 | acpi_status status; |
244 | acpi_handle dummy_handle; | 244 | acpi_handle dummy_handle; |
245 | struct pci_bus *pci_bus; | 245 | struct pci_bus *pci_bus; |