diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 07:41:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 07:41:27 -0400 |
| commit | 2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b (patch) | |
| tree | 45c4575110c61ca181196c038e1579f0f4fb0174 /drivers/acpi/executer/exregion.c | |
| parent | 34646bca474142e1424e5f6c4a33cb2ba0930ea1 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/paravirt-spinlocks
Conflicts:
arch/x86/kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/acpi/executer/exregion.c')
| -rw-r--r-- | drivers/acpi/executer/exregion.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c index 7cd8bb54fa01..7a41c409ae4d 100644 --- a/drivers/acpi/executer/exregion.c +++ b/drivers/acpi/executer/exregion.c | |||
| @@ -156,7 +156,7 @@ acpi_ex_system_memory_space_handler(u32 function, | |||
| 156 | /* Create a new mapping starting at the address given */ | 156 | /* Create a new mapping starting at the address given */ |
| 157 | 157 | ||
| 158 | mem_info->mapped_logical_address = | 158 | mem_info->mapped_logical_address = |
| 159 | acpi_os_map_memory((acpi_native_uint) address, window_size); | 159 | acpi_os_map_memory((acpi_physical_address) address, window_size); |
| 160 | if (!mem_info->mapped_logical_address) { | 160 | if (!mem_info->mapped_logical_address) { |
| 161 | ACPI_ERROR((AE_INFO, | 161 | ACPI_ERROR((AE_INFO, |
| 162 | "Could not map memory at %8.8X%8.8X, size %X", | 162 | "Could not map memory at %8.8X%8.8X, size %X", |