From 3edc67b817bf795d44d100e4b5e317effddf199b Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sun, 23 Mar 2008 01:03:17 -0700
Subject: [PATCH] --- yaml --- r: 89012 b: refs/heads/master c:
 72f74fa25a468f40781e452f1d2528395090d55f h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/asm-x86/ptrace.h | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9db441c28239..1675fbdc2e4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 708c5662975518eeea04de10cb11075d48636180
+refs/heads/master: 72f74fa25a468f40781e452f1d2528395090d55f
diff --git a/trunk/include/asm-x86/ptrace.h b/trunk/include/asm-x86/ptrace.h
index bc442461ac64..e779f2b26b32 100644
--- a/trunk/include/asm-x86/ptrace.h
+++ b/trunk/include/asm-x86/ptrace.h
@@ -140,7 +140,8 @@ extern unsigned long
 convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs);
 
 #ifdef CONFIG_X86_32
-extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code);
+extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
+			 int error_code);
 #else
 void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
 #endif
@@ -169,8 +170,8 @@ static inline int user_mode(struct pt_regs *regs)
 static inline int user_mode_vm(struct pt_regs *regs)
 {
 #ifdef CONFIG_X86_32
-	return ((regs->cs & SEGMENT_RPL_MASK) |
-		(regs->flags & VM_MASK)) >= USER_RPL;
+	return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & VM_MASK)) >=
+		USER_RPL;
 #else
 	return user_mode(regs);
 #endif