From ef6aa68503549748e899eab38ac2671e304fcdc0 Mon Sep 17 00:00:00 2001
From: Chuck Ebbert <76306.1226@compuserve.com>
Date: Tue, 26 Jul 2005 21:57:24 -0400
Subject: [PATCH] --- yaml --- r: 5087 b: refs/heads/master c:
 ae6578fe9b65208dee8eda40629984efd23740c4 h: refs/heads/master i:   5085:
 8701d2c30fd89addabc36f7a88437cbe31f896df   5083:
 f25ce118c7c30eee21004ed39bf22d557b95b93f   5079:
 344298fb3588524c53496cc18900fe6fc2068217   5071:
 7ca250d6666a066195082d27169c57c418a3d21b   5055:
 ffe914b48f816c07b71911b4937de2ce100892ce v: v3

---
 [refs]                          |  2 +-
 trunk/include/asm-i386/ptrace.h | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 831cf7777f68..cde6cbc2c444 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d7de66e2cc508761f050d1d4eaca88a6e6f711e
+refs/heads/master: ae6578fe9b65208dee8eda40629984efd23740c4
diff --git a/trunk/include/asm-i386/ptrace.h b/trunk/include/asm-i386/ptrace.h
index eef9f93870d4..b926cb4f4cfd 100644
--- a/trunk/include/asm-i386/ptrace.h
+++ b/trunk/include/asm-i386/ptrace.h
@@ -57,14 +57,21 @@ struct pt_regs {
 #ifdef __KERNEL__
 struct task_struct;
 extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code);
-#define user_mode(regs)		(3 & (regs)->xcs)
-#define user_mode_vm(regs)	((VM_MASK & (regs)->eflags) || user_mode(regs))
+
+static inline int user_mode(struct pt_regs *regs)
+{
+	return (regs->xcs & 3) != 0;
+}
+static inline int user_mode_vm(struct pt_regs *regs)
+{
+	return ((regs->xcs & 3) | (regs->eflags & VM_MASK)) != 0;
+}
 #define instruction_pointer(regs) ((regs)->eip)
 #if defined(CONFIG_SMP) && defined(CONFIG_FRAME_POINTER)
 extern unsigned long profile_pc(struct pt_regs *regs);
 #else
 #define profile_pc(regs) instruction_pointer(regs)
 #endif
-#endif
+#endif /* __KERNEL__ */
 
 #endif