Signed-off-by: Joe Perches

---

 include/asm-x86/ptrace.h |    7 ++++---

 1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/asm-x86/ptrace.h b/include/asm-x86/ptrace.h

index bc44246..e779f2b 100644

--- a/include/asm-x86/ptrace.h

+++ b/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

--

1.5.4.rc2
--

unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

the body of a message to majordomo@vger.kernel.org

More majordomo info at  http://vger.kernel.org/majordomo-info.html

Please read the FAQ at  http://www.tux.org/lkml/