Commit-ID: 6c3176a21652e506ca7efb8fa37a651a3c513bb5 Gitweb: http://git.kernel.org/tip/6c3176a21652e506ca7efb8fa37a651a3c513bb5 Author: Denys Vlasenko <dvlasenk@xxxxxxxxxx> AuthorDate: Sat, 10 Jan 2015 23:00:08 +0100 Committer: Andy Lutomirski <luto@xxxxxxxxxxxxxx> CommitDate: Tue, 13 Jan 2015 14:10:31 -0800 x86: ia32entry.S: fix wrong symbolic constant usage: R11->ARGOFFSET The values of these two constants are the same, the meaning is different. Acked-by: Borislav Petkov <bp@xxxxxxx> CC: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> CC: Oleg Nesterov <oleg@xxxxxxxxxx> CC: "H. Peter Anvin" <hpa@xxxxxxxxx> CC: Borislav Petkov <bp@xxxxxxxxx> CC: Frederic Weisbecker <fweisbec@xxxxxxxxx> CC: X86 ML <x86@xxxxxxxxxx> CC: Alexei Starovoitov <ast@xxxxxxxxxxxx> CC: Will Drewry <wad@xxxxxxxxxxxx> CC: Kees Cook <keescook@xxxxxxxxxxxx> CC: linux-kernel@xxxxxxxxxxxxxxx Signed-off-by: Denys Vlasenko <dvlasenk@xxxxxxxxxx> Signed-off-by: Andy Lutomirski <luto@xxxxxxxxxxxxxx> --- arch/x86/ia32/ia32entry.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index 82e8a1d..156ebca 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S @@ -179,8 +179,8 @@ sysenter_dispatch: sysexit_from_sys_call: andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET) /* clear IF, that popfq doesn't enable interrupts early */ - andl $~0x200,EFLAGS-R11(%rsp) - movl RIP-R11(%rsp),%edx /* User %eip */ + andl $~0x200,EFLAGS-ARGOFFSET(%rsp) + movl RIP-ARGOFFSET(%rsp),%edx /* User %eip */ CFI_REGISTER rip,rdx RESTORE_ARGS 0,24,0,0,0,0 xorq %r8,%r8 -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|