Merge branch 'x86/tracehook' into x86-v28-for-linus-phase1
authorIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 16:16:40 +0000 (18:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 16:16:40 +0000 (18:16 +0200)
Conflicts:
arch/x86/kernel/signal_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/kernel/ptrace.c
arch/x86/kernel/signal_32.c
arch/x86/kernel/signal_64.c
include/asm-x86/ptrace.h
include/asm-x86/thread_info.h

Simple merge
Simple merge
index 2f14640500599f091720ab69ec61d44c072a7ebc,1e1933892b4fe115fd18676af49decf5ae267a7f..4d32487805ef9c5a7ae0e854867cc43a74ab1b5d
@@@ -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)))
Simple merge
Simple merge