diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
| commit | cf816ecb533ab96b883dfdc0db174598b5b5c4d2 (patch) | |
| tree | 1b7705db288ae2917105e624b01fdf81e0882bf1 /include/asm-x86/acpi.h | |
| parent | adf6d34e460387ee3e8f1e1875d52bff51212c7d (diff) | |
| parent | 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9 (diff) | |
Merge branch 'merge-fixes' into devel
Diffstat (limited to 'include/asm-x86/acpi.h')
| -rw-r--r-- | include/asm-x86/acpi.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-x86/acpi.h b/include/asm-x86/acpi.h index 7a72d6aa50be..14411c9de46f 100644 --- a/include/asm-x86/acpi.h +++ b/include/asm-x86/acpi.h | |||
| @@ -67,16 +67,16 @@ int __acpi_release_global_lock(unsigned int *lock); | |||
| 67 | */ | 67 | */ |
| 68 | #define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \ | 68 | #define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \ |
| 69 | asm("divl %2;" \ | 69 | asm("divl %2;" \ |
| 70 | :"=a"(q32), "=d"(r32) \ | 70 | : "=a"(q32), "=d"(r32) \ |
| 71 | :"r"(d32), \ | 71 | : "r"(d32), \ |
| 72 | "0"(n_lo), "1"(n_hi)) | 72 | "0"(n_lo), "1"(n_hi)) |
| 73 | 73 | ||
| 74 | 74 | ||
| 75 | #define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \ | 75 | #define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \ |
| 76 | asm("shrl $1,%2 ;" \ | 76 | asm("shrl $1,%2 ;" \ |
| 77 | "rcrl $1,%3;" \ | 77 | "rcrl $1,%3;" \ |
| 78 | :"=r"(n_hi), "=r"(n_lo) \ | 78 | : "=r"(n_hi), "=r"(n_lo) \ |
| 79 | :"0"(n_hi), "1"(n_lo)) | 79 | : "0"(n_hi), "1"(n_lo)) |
| 80 | 80 | ||
| 81 | #ifdef CONFIG_ACPI | 81 | #ifdef CONFIG_ACPI |
| 82 | extern int acpi_lapic; | 82 | extern int acpi_lapic; |