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

Commit 84b06ca3 authored by Aleksey Makarov's avatar Aleksey Makarov Committed by Rafael J. Wysocki
Browse files

ACPI / tables: move arch-specific symbol to asm/acpi.h 



The constant that defines max phys address where the new upgraded
ACPI table should be allocated is arch-specific.  Move it to
<asm/acpi.h>

Signed-off-by: default avatarAleksey Makarov <aleksey.makarov@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent da3d3f98

arch/x86/include/asm/acpi.h

+2 −0
Original line number Diff line number Diff line
@@ -170,4 +170,6 @@ static inline pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) 
}

#endif



#define ACPI_TABLE_UPGRADE_MAX_PHYS (max_low_pfn_mapped << PAGE_SHIFT)



#endif /* _ASM_X86_ACPI_H */

drivers/acpi/tables.c

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/earlycpio.h>

#include <linux/memblock.h>

#include <linux/initrd.h>

#include <linux/acpi.h>

#include "internal.h"



#ifdef CONFIG_ACPI_CUSTOM_DSDT
@@ -543,7 +544,7 @@ void __init acpi_table_upgrade(void) 
		return;



	acpi_tables_addr =

		memblock_find_in_range(0, max_low_pfn_mapped << PAGE_SHIFT,

		memblock_find_in_range(0, ACPI_TABLE_UPGRADE_MAX_PHYS,

				       all_tables_size, PAGE_SIZE);

	if (!acpi_tables_addr) {

		WARN_ON(1);