diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 16:18:26 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 18:06:53 +0200 |
commit | 0962f402af1bb0b53ccee626785d202a10c12fff (patch) | |
tree | 26fa57193f16e45c6e0557049d02164f129077ed /arch/x86/kernel/signal_64.c | |
parent | 19268ed7449c561694d048a34601a30e2d1aaf79 (diff) | |
parent | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (diff) | |
download | op-kernel-dev-0962f402af1bb0b53ccee626785d202a10c12fff.zip op-kernel-dev-0962f402af1bb0b53ccee626785d202a10c12fff.tar.gz |
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
Conflicts:
arch/x86/kernel/process_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/signal_64.c')
-rw-r--r-- | arch/x86/kernel/signal_64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c index ca316b5..2f14640 100644 --- a/arch/x86/kernel/signal_64.c +++ b/arch/x86/kernel/signal_64.c @@ -26,6 +26,7 @@ #include <asm/proto.h> #include <asm/ia32_unistd.h> #include <asm/mce.h> +#include <asm/syscalls.h> #include "sigframe.h" #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) |