Messages in this thread Patch in this message | | | From | Denys Vlasenko <> | Subject | [PATCH 1/3 RESEND] x86, acpi: Eliminate saved_eip global variable | Date | Fri, 3 Jul 2015 22:08:33 +0200 |
| |
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@redhat.com> CC: Pavel Machek <pavel@ucw.cz> CC: Linus Torvalds <torvalds@linux-foundation.org> CC: Steven Rostedt <rostedt@goodmis.org> CC: Ingo Molnar <mingo@kernel.org> CC: Borislav Petkov <bp@alien8.de> CC: "H. Peter Anvin" <hpa@zytor.com> CC: Andy Lutomirski <luto@amacapital.net> CC: Oleg Nesterov <oleg@redhat.com> CC: Frederic Weisbecker <fweisbec@gmail.com> CC: Alexei Starovoitov <ast@plumgrid.com> CC: Will Drewry <wad@chromium.org> CC: Kees Cook <keescook@chromium.org> CC: x86@kernel.org CC: linux-kernel@vger.kernel.org ---
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
| |