diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-09-11 08:23:29 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-09-11 08:23:29 +0200 |
| commit | 633c8efb6285e77b13640d7e02178f0ec032262d (patch) | |
| tree | 352647f4248e0a1aa7bdc97a9e03b814f0a5eec6 /xen/arch/x86/acpi/lib.c | |
| parent | aaee744f5f5f42be89fdaa9b9ab47687a5363359 (diff) | |
| download | xen-633c8efb6285e77b13640d7e02178f0ec032262d.tar.gz xen-633c8efb6285e77b13640d7e02178f0ec032262d.tar.bz2 xen-633c8efb6285e77b13640d7e02178f0ec032262d.zip | |
ACPI: fix acpi_os_map_memory()
It using map_domain_page() was entirely wrong. Use __acpi_map_table()
instead for the time being, with locking added as the mappings it
produces get replaced with subsequent invocations. Using locking in
this way is acceptable here since the only two runtime callers are
acpi_os_{read,write}_memory(), which don't leave mappings pending upon
returning to their callers.
Also fix __acpi_map_table()'s first parameter's type - while benign for
unstable, backports to pre-4.3 trees will need this.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
master commit: 2ee9cbf9d8eaeff6e21222905d22dbd58dc5fe29
master date: 2013-08-21 08:38:40 +0200
Diffstat (limited to 'xen/arch/x86/acpi/lib.c')
| -rw-r--r-- | xen/arch/x86/acpi/lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/acpi/lib.c b/xen/arch/x86/acpi/lib.c index e8e69d1cb4..1f98c316c3 100644 --- a/xen/arch/x86/acpi/lib.c +++ b/xen/arch/x86/acpi/lib.c @@ -39,7 +39,7 @@ u32 __read_mostly x86_acpiid_to_apicid[MAX_MADT_ENTRIES] = * from the fixed base. That's why we start at FIX_ACPI_END and * count idx down while incrementing the phys address. */ -char *__acpi_map_table(unsigned long phys, unsigned long size) +char *__acpi_map_table(paddr_t phys, unsigned long size) { unsigned long base, offset, mapped_size; int idx; |