Merge branches 'topic/asoc', 'topic/misc-fixes' and 'topic/hda' into for-linus

[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..a2025525a15ab20dca199a9e3acf95b2d1d7fcff 100644 (file)
--- a/include/asm-x86/ptrace.h
+++ b/include/asm-x86/ptrace.h
@@ -174,13 +174,9 @@ extern unsigned long profile_pc(struct pt_regs *regs);
 
 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);
-#else
+                        int error_code, int si_code);
 void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
-#endif
 
 extern long syscall_trace_enter(struct pt_regs *);
 extern void syscall_trace_leave(struct pt_regs *);