Home » Mailing list archives » linux-kernel » 2008 » July » 14

[PATCH] x86_64: ia32_signal.c: use macro instead of immediate

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Hiroshi Shimamoto <h-shimamoto@...>
To: Ingo Molnar <mingo@...>, Thomas Gleixner <tglx@...>, H. Peter Anvin <hpa@...>
Cc: <linux-kernel@...>
Subject: [PATCH] x86_64: ia32_signal.c: use macro instead of immediate
Date: Monday, July 14, 2008 - 5:14 pm

From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>

Make and use macro FIX_EFLAGS, instead of immediate value 0x40DD5 in
ia32_restore_sigcontext().

Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
---
 arch/x86/ia32/ia32_signal.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index cb3856a..7cf50cb 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -36,6 +36,17 @@
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 
+#define __FIX_EFLAGS	(X86_EFLAGS_AC | X86_EFLAGS_OF | \
+			 X86_EFLAGS_DF | X86_EFLAGS_TF | X86_EFLAGS_SF | \
+			 X86_EFLAGS_ZF | X86_EFLAGS_AF | X86_EFLAGS_PF | \
+			 X86_EFLAGS_CF)
+
+#ifdef CONFIG_X86_32
+# define FIX_EFLAGS	(__FIX_EFLAGS | X86_EFLAGS_RF)
+#else
+# define FIX_EFLAGS	__FIX_EFLAGS
+#endif
+
 asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset);
 void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
 
@@ -248,7 +259,7 @@ static int ia32_restore_sigcontext(struct pt_regs *regs,
 	regs->ss |= 3;
 
 	err |= __get_user(tmpflags, &sc->flags);
-	regs->flags = (regs->flags & ~0x40DD5) | (tmpflags & 0x40DD5);
+	regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS);
 	/* disable syscall checks */
 	regs->orig_ax = -1;
 
-- 
1.5.4.1


--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] x86_64: ia32_signal.c: use macro instead of immediate, Hiroshi Shimamoto, (Mon Jul 14, 5:14 pm)
Re: [PATCH] x86_64: ia32_signal.c: use macro instead of imme..., H. Peter Anvin, (Mon Jul 14, 6:05 pm)
Re: [PATCH] x86_64: ia32_signal.c: use macro instead of imme..., Hiroshi Shimamoto, (Mon Jul 14, 6:19 pm)
Re: [PATCH] x86_64: ia32_signal.c: use macro instead of imme..., H. Peter Anvin, (Mon Jul 14, 6:23 pm)
[PATCH] x86_64: ia32_signal.c: use macro instead of immediate, Hiroshi Shimamoto, (Mon Jul 14, 6:34 pm)
Re: [PATCH] x86_64: ia32_signal.c: use macro instead of imme..., Ingo Molnar, (Fri Jul 18, 7:53 am)
Re: [PATCH] x86_64: ia32_signal.c: use macro instead of imme..., Hiroshi Shimamoto, (Mon Jul 14, 6:26 pm)