Merge branches 'core/signal' and 'x86/spinlocks' into x86/xen

[linux-2.6-omap-h63xx.git] / include / asm-x86 / ptrace.h

diff --git a/include/asm-x86/ptrace.h b/include/asm-x86/ptrace.h
index d64a6109716531261d43bb1f80dc37060c6067dc..ac578f11c1c563e03cb31bf3e1a61fdfe2288c34 100644 (file)
--- a/include/asm-x86/ptrace.h
+++ b/include/asm-x86/ptrace.h
@@ -177,11 +177,11 @@ 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);
-#else
-void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
+                        int error_code, int si_code);
 #endif
 
+void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
+
 extern long syscall_trace_enter(struct pt_regs *);
 extern void syscall_trace_leave(struct pt_regs *);