Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (eed2ef44) · Commits · 戴 / test

arch/arm64/kernel/acpi.c

+20 −2

Original line number	Diff line number	Diff line
		@@ -298,8 +298,21 @@ void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size)
		case EFI_BOOT_SERVICES_DATA:
		case EFI_CONVENTIONAL_MEMORY:
		case EFI_PERSISTENT_MEMORY:
		if (memblock_is_map_memory(phys) \|\|
		!memblock_is_region_memory(phys, size)) {
		pr_warn(FW_BUG "requested region covers kernel memory @ %pa\n", &phys);
		return NULL;
		}
		/*
		* Mapping kernel memory is permitted if the region in
		* question is covered by a single memblock with the
		* NOMAP attribute set: this enables the use of ACPI
		* table overrides passed via initramfs, which are
		* reserved in memory using arch_reserve_mem_area()
		* below. As this particular use case only requires
		* read access, fall through to the R/O mapping case.
		*/
		fallthrough;

		case EFI_RUNTIME_SERVICES_CODE:
		/*
		@@ -388,3 +401,8 @@ int apei_claim_sea(struct pt_regs *regs)

		return err;
		}

		void arch_reserve_mem_area(acpi_physical_address addr, size_t size)
		{
		memblock_mark_nomap(addr, size);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -958,7 +958,7 @@ void acpi_os_set_prepare_extended_sleep(int (*func)(u8 sleep_state,
		acpi_status acpi_os_prepare_extended_sleep(u8 sleep_state,
		u32 val_a, u32 val_b);

		#ifdef CONFIG_X86
		#ifndef CONFIG_IA64
		void arch_reserve_mem_area(acpi_physical_address addr, size_t size);
		#else
		static inline void arch_reserve_mem_area(acpi_physical_address addr,