From: Denys Vlasenko <dvlasenk@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Denys Vlasenko <dvlasenk@redhat.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Oleg Nesterov <oleg@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Andy Lutomirski <luto@amacapital.net>,
Frederic Weisbecker <fweisbec@gmail.com>, X86 ML <x86@kernel.org>,
Alexei Starovoitov <ast@plumgrid.com>,
Will Drewry <wad@chromium.org>, Kees Cook <keescook@chromium.org>
Subject: [PATCH 2/8] x86: ia32entry.S: fix wrong symbolic constant usage: R11->ARGOFFSET
Date: Tue, 5 Aug 2014 16:52:28 +0200 [thread overview]
Message-ID: <1407250354-29525-3-git-send-email-dvlasenk@redhat.com> (raw)
In-Reply-To: <1407250354-29525-1-git-send-email-dvlasenk@redhat.com>
The values of these two constants are the same, the meaning is different.
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
CC: Linus Torvalds <torvalds@linux-foundation.org>
CC: Oleg Nesterov <oleg@redhat.com>
CC: "H. Peter Anvin" <hpa@zytor.com>
CC: Andy Lutomirski <luto@amacapital.net>
CC: Frederic Weisbecker <fweisbec@gmail.com>
CC: X86 ML <x86@kernel.org>
CC: Alexei Starovoitov <ast@plumgrid.com>
CC: Will Drewry <wad@chromium.org>
CC: Kees Cook <keescook@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 4299eb0..59c8d3a 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -169,8 +169,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
next prev parent reply other threads:[~2014-08-05 14:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-05 14:52 [PATCH v3 0/8] x86: entry_64.S: always allocate complete "struct pt_regs" Denys Vlasenko
2014-08-05 14:52 ` [PATCH 1/8] x86: entry_64.S: delete unused code Denys Vlasenko
2014-08-05 14:52 ` Denys Vlasenko [this message]
2014-08-05 14:52 ` [PATCH 3/8] x86: open-code register save/restore in trace_hardirqs thunks Denys Vlasenko
2014-08-05 14:52 ` [PATCH 4/8] x86: entry_64.S: fold SAVE_ARGS_IRQ macro into its sole user Denys Vlasenko
2014-08-05 14:52 ` [PATCH 5/8] x86: entry_64.S: always allocate complete "struct pt_regs" Denys Vlasenko
2014-08-05 14:52 ` [PATCH 6/8] x86: mass removal of ARGOFFSET Denys Vlasenko
2014-08-05 14:52 ` [PATCH 7/8] x86: rename some macros and labels, no code changes Denys Vlasenko
2014-08-05 14:52 ` [PATCH 8/8] x86: add comments about various syscall instructions, " Denys Vlasenko
2014-08-05 19:58 ` Oleg Nesterov
2014-08-08 16:18 ` Denys Vlasenko
2014-08-05 20:13 ` [PATCH v3 0/8] x86: entry_64.S: always allocate complete "struct pt_regs" H. Peter Anvin
2014-08-06 15:07 ` Denys Vlasenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1407250354-29525-3-git-send-email-dvlasenk@redhat.com \
--to=dvlasenk@redhat.com \
--cc=ast@plumgrid.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=oleg@redhat.com \
--cc=torvalds@linux-foundation.org \
--cc=wad@chromium.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®