Commit d344e38b authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Ingo Molnar
Browse files

x86, nx: Mark the ACPI resume trampoline code as +x

We reserve lowmem for the things that need it, like the ACPI
wakeup code, way early to guarantee availability.  This happens
before we set up the proper pagetables, so set_memory_x() has no

Until we have a better solution, use an initcall to mark the
wakeup code executable.
Originally-by: default avatarMatthieu Castet <>
Signed-off-by: default avatarH. Peter Anvin <>
Cc: Matthias Hopf <>
Cc: Suresh Siddha <>
LKML-Reference: <>
Signed-off-by: default avatarIngo Molnar <>
parent 8dbdea84
......@@ -12,10 +12,8 @@
#include <linux/cpumask.h>
#include <asm/segment.h>
#include <asm/desc.h>
#ifdef CONFIG_X86_32
#include <asm/pgtable.h>
#include <asm/cacheflush.h>
#include "realmode/wakeup.h"
#include "sleep.h"
......@@ -149,6 +147,15 @@ void __init acpi_reserve_wakeup_memory(void)
memblock_x86_reserve_range(mem, mem + WAKEUP_SIZE, "ACPI WAKEUP");
int __init acpi_configure_wakeup_memory(void)
if (acpi_realmode)
set_memory_x(acpi_realmode, WAKEUP_SIZE >> PAGE_SHIFT);
return 0;
static int __init acpi_sleep_setup(char *str)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment