| Message ID | 1348584961-1476-3-git-send-email-trenn@suse.de (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Tuesday, September 25, 2012 04:55:57 PM Thomas Renninger wrote: > This is needed for ACPI table overriding via initrd. Beside reserving > memblocks, X86 also requires to flag the memory area to E820_RESERVED or > E820_ACPI in the e820 mappings to be able to io(re)map it later. ... > index 4f2a762..bf6a0ad 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -430,4 +430,13 @@ acpi_status acpi_os_prepare_sleep(u8 sleep_state, > #define acpi_os_set_prepare_sleep(func, pm1a_ctrl, pm1b_ctrl) do { } while (0) > #endif > > +#if CONFIG_X86 > +void arch_reserve_mem_area(acpi_physical_address addr, size_t size); > +#else > +static inline void void arch_reserve_mem_area(acpi_physical_address addr, Argh: ...void void... I made sure every single patch compiles, so that no typo slips in, I haven't compiled it on an other arch and there ... a typo slipped in. Can this get manually fixed? Tell me and I can also resend. Thomas -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index b2297e5..6b75777 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -1700,3 +1700,9 @@ int __acpi_release_global_lock(unsigned int *lock) } while (unlikely (val != old)); return old & 0x1; } + +void __init arch_reserve_mem_area(acpi_physical_address addr, size_t size) +{ + e820_add_region(addr, size, E820_ACPI); + update_e820(); +} diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 4f2a762..bf6a0ad 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -430,4 +430,13 @@ acpi_status acpi_os_prepare_sleep(u8 sleep_state, #define acpi_os_set_prepare_sleep(func, pm1a_ctrl, pm1b_ctrl) do { } while (0) #endif +#if CONFIG_X86 +void arch_reserve_mem_area(acpi_physical_address addr, size_t size); +#else +static inline void void arch_reserve_mem_area(acpi_physical_address addr, + size_t size) +{ +} +#endif /* CONFIG_X86 */ + #endif /*_LINUX_ACPI_H*/
This is needed for ACPI table overriding via initrd. Beside reserving memblocks, X86 also requires to flag the memory area to E820_RESERVED or E820_ACPI in the e820 mappings to be able to io(re)map it later. Signed-off-by: Thomas Renninger <trenn@suse.de> --- arch/x86/kernel/acpi/boot.c | 6 ++++++ include/linux/acpi.h | 9 +++++++++ 2 files changed, 15 insertions(+), 0 deletions(-)