Commit daacf8bc authored Jun 23, 2006 by Shaohua Li Committed by Linus Torvalds Jun 23, 2006

[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>

parent e084dbd3

arch/i386/kernel/acpi/wakeup.S

+4 −5

Original line number	Diff line number	Diff line
		@@ -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
		@@ -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