diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-01 11:49:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-01 11:49:01 -0700 |
| commit | eed2ef4403de3d8937ccb624e15d3c5004e7dda5 (patch) | |
| tree | b017f791f0fcd3679020cb0e8b1a6cf222d6d41e /include | |
| parent | fcadab740480e0e0e9fa9bd272acd409884d431a (diff) | |
| parent | a509a66a9d0d4f4e304d58fad38c078d0336c445 (diff) | |
| download | linux-eed2ef4403de3d8937ccb624e15d3c5004e7dda5.tar.bz2 | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Catalin Marinas:
"A previous commit to prevent AML memory opregions from accessing the
kernel memory turned out to be too restrictive. Relax the permission
check to permit the ACPI core to map kernel memory used for table
overrides"
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: permit ACPI core to map kernel memory used for table overrides
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 1e4cdc6c7ae2..64ae25c59d55 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -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, |