Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eecb9a69 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: always explicitly map acpi memory 



Always map acpi tables, rather than assuming we can use the normal
linear mapping to access the acpi tables.  This is necessary in a
virtual environment where the linear mappings are to pseudo-physical
memory, but the acpi tables exist at a real physical address.  It
doesn't hurt to map in the normal non-virtual case, so just do it
unconditionally.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Acked-by: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1c14fa49

arch/x86/kernel/acpi/boot.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -127,9 +127,6 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) 
	if (!phys || !size)

	if (!phys || !size)

		return NULL;

		return NULL;





	if (phys+size <= (max_low_pfn_mapped << PAGE_SHIFT))

		return __va(phys);



	if (prev_map)

	if (prev_map)

		early_iounmap(prev_map, prev_size);

		early_iounmap(prev_map, prev_size);