diff options
Diffstat (limited to 'drivers/acpi/acpica/exmisc.c')
-rw-r--r-- | drivers/acpi/acpica/exmisc.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c index 998eac329937..c5bb1eeed2df 100644 --- a/drivers/acpi/acpica/exmisc.c +++ b/drivers/acpi/acpica/exmisc.c | |||
@@ -6,7 +6,7 @@ | |||
6 | *****************************************************************************/ | 6 | *****************************************************************************/ |
7 | 7 | ||
8 | /* | 8 | /* |
9 | * Copyright (C) 2000 - 2008, Intel Corp. | 9 | * Copyright (C) 2000 - 2010, Intel Corp. |
10 | * All rights reserved. | 10 | * All rights reserved. |
11 | * | 11 | * |
12 | * Redistribution and use in source and binary forms, with or without | 12 | * Redistribution and use in source and binary forms, with or without |
@@ -409,8 +409,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0, | |||
409 | * | 409 | * |
410 | ******************************************************************************/ | 410 | ******************************************************************************/ |
411 | 411 | ||
412 | acpi_integer | 412 | u64 acpi_ex_do_math_op(u16 opcode, u64 integer0, u64 integer1) |
413 | acpi_ex_do_math_op(u16 opcode, acpi_integer integer0, acpi_integer integer1) | ||
414 | { | 413 | { |
415 | 414 | ||
416 | ACPI_FUNCTION_ENTRY(); | 415 | ACPI_FUNCTION_ENTRY(); |
@@ -498,8 +497,7 @@ acpi_ex_do_math_op(u16 opcode, acpi_integer integer0, acpi_integer integer1) | |||
498 | 497 | ||
499 | acpi_status | 498 | acpi_status |
500 | acpi_ex_do_logical_numeric_op(u16 opcode, | 499 | acpi_ex_do_logical_numeric_op(u16 opcode, |
501 | acpi_integer integer0, | 500 | u64 integer0, u64 integer1, u8 *logical_result) |
502 | acpi_integer integer1, u8 * logical_result) | ||
503 | { | 501 | { |
504 | acpi_status status = AE_OK; | 502 | acpi_status status = AE_OK; |
505 | u8 local_result = FALSE; | 503 | u8 local_result = FALSE; |
@@ -564,8 +562,8 @@ acpi_ex_do_logical_op(u16 opcode, | |||
564 | union acpi_operand_object *operand1, u8 * logical_result) | 562 | union acpi_operand_object *operand1, u8 * logical_result) |
565 | { | 563 | { |
566 | union acpi_operand_object *local_operand1 = operand1; | 564 | union acpi_operand_object *local_operand1 = operand1; |
567 | acpi_integer integer0; | 565 | u64 integer0; |
568 | acpi_integer integer1; | 566 | u64 integer1; |
569 | u32 length0; | 567 | u32 length0; |
570 | u32 length1; | 568 | u32 length1; |
571 | acpi_status status = AE_OK; | 569 | acpi_status status = AE_OK; |