[PATCH 1/3 RESEND] x86, acpi: Eliminate saved_eip global variable

From: Denys Vlasenko
Date: Fri Jul 03 2015 - 16:09:03 EST


Get rid of the global variable saved_eip as it is only written to.
Jump directly to ret_point instead. No functionality change.

Run-tested.

Signed-off-by: Denys Vlasenko <dvlasenk@xxxxxxxxxx>
CC: Pavel Machek <pavel@xxxxxx>
CC: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
CC: Steven Rostedt <rostedt@xxxxxxxxxxx>
CC: Ingo Molnar <mingo@xxxxxxxxxx>
CC: Borislav Petkov <bp@xxxxxxxxx>
CC: "H. Peter Anvin" <hpa@xxxxxxxxx>
CC: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
CC: Oleg Nesterov <oleg@xxxxxxxxxx>
CC: Frederic Weisbecker <fweisbec@xxxxxxxxx>
CC: Alexei Starovoitov <ast@xxxxxxxxxxxx>
CC: Will Drewry <wad@xxxxxxxxxxxx>
CC: Kees Cook <keescook@xxxxxxxxxxxx>
CC: x86@xxxxxxxxxx
CC: linux-kernel@xxxxxxxxxxxxxxx
---

All three patches are a resend. They still apply cleanly to mingo/tip.git

arch/x86/kernel/acpi/wakeup_32.S | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
index 665c6b7..eef2bd3 100644
--- a/arch/x86/kernel/acpi/wakeup_32.S
+++ b/arch/x86/kernel/acpi/wakeup_32.S
@@ -31,17 +31,11 @@ wakeup_pmode_return:

movl %cs:saved_magic, %eax
cmpl $0x12345678, %eax
- jne bogus_magic
-
- # jump to place where we left off
- movl saved_eip, %eax
- jmp *%eax
-
+ je ret_point
bogus_magic:
jmp bogus_magic


-
save_registers:
sidt saved_idt
sldt saved_ldt
@@ -56,7 +50,6 @@ save_registers:
pushfl
popl saved_context_eflags

- movl $ret_point, saved_eip
ret


@@ -88,7 +81,6 @@ ret_point:
.data
ALIGN
ENTRY(saved_magic) .long 0
-ENTRY(saved_eip) .long 0

# saved registers
saved_idt: .long 0,0
--
1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/