Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, nx: Mark the ACPI resume trampoline code as +x
+10
-3
+10
-3
arch/x86/kernel/acpi/sleep.c
+10
-3
arch/x86/kernel/acpi/sleep.c
···
12
12
#include <linux/cpumask.h>
13
13
#include <asm/segment.h>
14
14
#include <asm/desc.h>
15
-
16
-
#ifdef CONFIG_X86_32
17
15
#include <asm/pgtable.h>
18
-
#endif
16
+
#include <asm/cacheflush.h>
19
17
20
18
#include "realmode/wakeup.h"
21
19
#include "sleep.h"
···
146
148
acpi_wakeup_address = mem;
147
149
memblock_x86_reserve_range(mem, mem + WAKEUP_SIZE, "ACPI WAKEUP");
148
150
}
151
+
152
+
int __init acpi_configure_wakeup_memory(void)
153
+
{
154
+
if (acpi_realmode)
155
+
set_memory_x(acpi_realmode, WAKEUP_SIZE >> PAGE_SHIFT);
156
+
157
+
return 0;
158
+
}
159
+
arch_initcall(acpi_configure_wakeup_memory);
149
160
150
161
151
162
static int __init acpi_sleep_setup(char *str)