On Sat, Jan 10, 2015 at 2:00 PM, Denys Vlasenko <dvlas...@redhat.com> wrote: > The values of these two constants are the same, the meaning is different.
Acked-by: Andy Lutomirski <l...@amacapital.net> I'll make the same change to my pending entry work, and hopefully we can avoid conflicts. --Andy > > Signed-off-by: Denys Vlasenko <dvlas...@redhat.com> > Acked-by: Borislav Petkov <b...@suse.de> > CC: Linus Torvalds <torva...@linux-foundation.org> > CC: Oleg Nesterov <o...@redhat.com> > CC: "H. Peter Anvin" <h...@zytor.com> > CC: Borislav Petkov <b...@alien8.de> > CC: Andy Lutomirski <l...@amacapital.net> > CC: Frederic Weisbecker <fweis...@gmail.com> > CC: X86 ML <x...@kernel.org> > CC: Alexei Starovoitov <a...@plumgrid.com> > CC: Will Drewry <w...@chromium.org> > CC: Kees Cook <keesc...@chromium.org> > CC: linux-kernel@vger.kernel.org > --- > 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 > -- > 1.8.1.4 > -- Andy Lutomirski AMA Capital Management, LLC -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
