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/button.c | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| download | kernel_samsung_aries-27663c5855b10af9ec67bc7dfba001426ba21222.zip kernel_samsung_aries-27663c5855b10af9ec67bc7dfba001426ba21222.tar.gz kernel_samsung_aries-27663c5855b10af9ec67bc7dfba001426ba21222.tar.bz2 | |
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/button.c')
| -rw-r--r-- | drivers/acpi/button.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index 1dfec41..baeb661 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -145,7 +145,7 @@ static int acpi_button_state_seq_show(struct seq_file *seq, void *offset) { struct acpi_button *button = seq->private; acpi_status status; - unsigned long state; + unsigned long long state; if (!button || !button->device) return 0; @@ -253,7 +253,7 @@ static int acpi_button_remove_fs(struct acpi_device *device) -------------------------------------------------------------------------- */ static int acpi_lid_send_state(struct acpi_button *button) { - unsigned long state; + unsigned long long state; acpi_status status; status = acpi_evaluate_integer(button->device->handle, "_LID", NULL, |