From: Ian Campbell <ian.campbell@citrix.com>
To: linux-kernel@vger.kernel.org
Cc: Pekka Enberg <penberg@kernel.org>,
Cyrill Gorcunov <gorcunov@gmail.com>,
"H. Peter Anvin" <hpa@zytor.com>, Andi Kleen <ak@linux.intel.com>,
Ian Campbell <ian.campbell@citrix.com>,
x86@kernel.org
Subject: [PATCH 3/3] x86: ret_from_fork: use symbolic contants for bits in EFLAGS
Date: Mon, 25 Jul 2011 11:03:07 +0100 [thread overview]
Message-ID: <1311588187-20079-3-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1311587883.27940.20.camel@cthulhu.hellion.org.uk>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Acked-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: x86@kernel.org
---
arch/x86/kernel/entry_32.S | 2 +-
arch/x86/kernel/entry_64.S | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 5c1a9197..f032530 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -303,7 +303,7 @@ ENTRY(ret_from_fork)
call schedule_tail
GET_THREAD_INFO(%ebp)
popl_cfi %eax
- pushl_cfi $0x0202 # Reset kernel eflags
+ pushl_cfi $(X86_EFLAGS_IF|0x2) # Reset kernel eflags
popfl_cfi
jmp syscall_exit
CFI_ENDPROC
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 9c28bd5..4c76abf 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -399,7 +399,7 @@ ENTRY(ret_from_fork)
call schedule_tail # rdi: 'prev' task parameter
- pushq_cfi $0x0202
+ pushq_cfi $(X86_EFLAGS_IF|0x2)
popfq_cfi # reset kernel eflags
GET_THREAD_INFO(%rcx)
--
1.7.2.5
next prev parent reply other threads:[~2011-07-25 10:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-25 9:58 [PATCH 0/3] minor cleanups to EFLAGS initialisation in ret_from_fork Ian Campbell
2011-07-25 10:03 ` [PATCH 1/3] x86: drop unnecessary kernel_eflags variable from 64 bit Ian Campbell
2011-07-25 10:03 ` [PATCH 2/3] x86: make 64 bit ret_from_fork a little more similar to 32 bit Ian Campbell
2011-07-25 10:03 ` Ian Campbell [this message]
2011-07-25 10:19 ` [PATCH 0/3] minor cleanups to EFLAGS initialisation in ret_from_fork Cyrill Gorcunov
2011-07-25 18:20 ` Cyrill Gorcunov
2011-07-25 21:10 ` H. Peter Anvin
2011-07-25 21:47 ` Cyrill Gorcunov
2011-07-26 14:46 ` Peter Zijlstra
2011-07-26 15:51 ` Ian Campbell
2011-08-10 15:27 ` Ian Campbell
2011-08-10 15:35 ` Peter Zijlstra
-- strict thread matches above, loose matches on Subject: below --
2011-07-05 11:15 [Q x86-64] on kernel_eflags Cyrill Gorcunov
2011-07-05 13:00 ` [PATCH 3/3] x86: ret_from_fork: use symbolic contants for bits in EFLAGS Ian Campbell
2011-07-06 9:36 ` Pekka Enberg
2010-02-09 15:56 [PATCH 0/3] x86: slightly unify ret_from_fork Ian Campbell
2010-02-09 15:56 ` [PATCH 3/3] x86: ret_from_fork: use symbolic contants for bits in EFLAGS Ian Campbell
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=1311588187-20079-3-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=ak@linux.intel.com \
--cc=gorcunov@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=penberg@kernel.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®