aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2006-06-23 05:04:50 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 10:43:00 -0400
commitdaacf8bc0dd37a6ad3a87d1a667599e15940815e (patch)
treed16b7b89d258b52cb95c00b1b53ce4fe5c379a3e /arch/i386
parente084dbd3a995f99f5444a9046e66d93c1b92c348 (diff)
[PATCH] move do_suspend_lowlevel to correct segment
Move do_suspend_lowlevel to correct segment. If it is in the same hugepage with ro data, mark_rodata_ro will make it unexecutable. Signed-off-by: Shaohua Li <shaohua.li@intel.com> Cc: Len Brown <len.brown@intel.com> Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/acpi/wakeup.S9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S
index dcb4d3c68ebb..9f408eee4e6f 100644
--- a/arch/i386/kernel/acpi/wakeup.S
+++ b/arch/i386/kernel/acpi/wakeup.S
@@ -265,11 +265,6 @@ ENTRY(acpi_copy_wakeup_routine)
265 movl $0x12345678, saved_magic 265 movl $0x12345678, saved_magic
266 ret 266 ret
267 267
268.data
269ALIGN
270ENTRY(saved_magic) .long 0
271ENTRY(saved_eip) .long 0
272
273save_registers: 268save_registers:
274 leal 4(%esp), %eax 269 leal 4(%esp), %eax
275 movl %eax, saved_context_esp 270 movl %eax, saved_context_esp
@@ -304,7 +299,11 @@ ret_point:
304 call restore_processor_state 299 call restore_processor_state
305 ret 300 ret
306 301
302.data
307ALIGN 303ALIGN
304ENTRY(saved_magic) .long 0
305ENTRY(saved_eip) .long 0
306
308# saved registers 307# saved registers
309saved_gdt: .long 0,0 308saved_gdt: .long 0,0
310saved_idt: .long 0,0 309saved_idt: .long 0,0