Skip to content

Commit

Permalink
[PATCH] move do_suspend_lowlevel to correct segment
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Shaohua Li authored and Linus Torvalds committed Jun 23, 2006
1 parent e084dbd commit daacf8b
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions arch/i386/kernel/acpi/wakeup.S
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,6 @@ ENTRY(acpi_copy_wakeup_routine)
movl $0x12345678, saved_magic
ret

.data
ALIGN
ENTRY(saved_magic) .long 0
ENTRY(saved_eip) .long 0

save_registers:
leal 4(%esp), %eax
movl %eax, saved_context_esp
Expand Down Expand Up @@ -304,7 +299,11 @@ ret_point:
call restore_processor_state
ret

.data
ALIGN
ENTRY(saved_magic) .long 0
ENTRY(saved_eip) .long 0

# saved registers
saved_gdt: .long 0,0
saved_idt: .long 0,0
Expand Down

0 comments on commit daacf8b

Please sign in to comment.