Merge branch 'x86/tracehook' into x86-v28-for-linus-phase1

Conflicts:
	arch/x86/kernel/signal_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc arch/x86/kernel/ptrace.c
Simple merge

diff --cc arch/x86/kernel/signal_32.c
Simple merge

diff --cc arch/x86/kernel/signal_64.c
index 2f14640500599f091720ab69ec61d44c072a7ebc,1e1933892b4fe115fd18676af49decf5ae267a7f..4d32487805ef9c5a7ae0e854867cc43a74ab1b5d
--- 1/arch/x86/kernel/signal_64.c
--- 2/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@@ -26,7 -27,7 +27,8 @@@
  #include <asm/proto.h>
  #include <asm/ia32_unistd.h>
  #include <asm/mce.h>
+ #include <asm/syscall.h>
 +#include <asm/syscalls.h>
  #include "sigframe.h"
  
  #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))

diff --cc include/asm-x86/ptrace.h
Simple merge

diff --cc include/asm-x86/thread_info.h
Simple merge