From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 6 Oct 2008 16:16:40 +0000 (+0200)
Subject: Merge branch 'x86/tracehook' into x86-v28-for-linus-phase1
X-Git-Tag: v2.6.28-rc1~734^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b159d7a989e53ab3529084348aa80441520b8575;p=linux-2.6-omap-h63xx.git

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>
---

b159d7a989e53ab3529084348aa80441520b8575
diff --cc arch/x86/kernel/signal_64.c
index 2f146405005,1e1933892b4..4d32487805e
--- a/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)))