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>

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 235a1386888a..f58fcbbc810d 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -608,7 +608,7 @@ static void acpi_os_derive_pci_id_2(acpi_handle rhandle,	/* upper bound  */
         acpi_handle handle;
         struct acpi_pci_id *pci_id = *id;
         acpi_status status;
-        unsigned long temp;
+        unsigned long long temp;
         acpi_object_type type;
 
         acpi_get_parent(chandle, &handle);
@@ -620,8 +620,7 @@ static void acpi_os_derive_pci_id_2(acpi_handle rhandle,	/* upper bound  */
                 if ((ACPI_FAILURE(status)) || (type != ACPI_TYPE_DEVICE))
                         return;
 
-                status =
-                    acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL,
+                status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL,
                                           &temp);
                 if (ACPI_SUCCESS(status)) {
                         u32 val;