diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-08 12:46:27 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-08 12:46:27 +0400 |
| commit | 7cd2541cf2395962daf98ec32a141aba3398a9b2 (patch) | |
| tree | 3c8bebb277462ba0de9d44233a970d34056dc45e /arch/m32r/include/asm/signal.h | |
| parent | c62f981f9309486ba5546edbb5925f71e441fa65 (diff) | |
| parent | cb655d0f3d57c23db51b981648e452988c0223f9 (diff) | |
| download | linux-7cd2541cf2395962daf98ec32a141aba3398a9b2.tar.xz | |
Merge commit 'v2.6.36-rc7' into perf/core
Conflicts:
arch/x86/kernel/module.c
Merge reason: Resolve the conflict, pick up fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m32r/include/asm/signal.h')
| -rw-r--r-- | arch/m32r/include/asm/signal.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m32r/include/asm/signal.h b/arch/m32r/include/asm/signal.h index 9c1acb2b1a92..b2eeb0de1c8d 100644 --- a/arch/m32r/include/asm/signal.h +++ b/arch/m32r/include/asm/signal.h @@ -157,7 +157,6 @@ typedef struct sigaltstack { #undef __HAVE_ARCH_SIG_BITOPS struct pt_regs; -extern int do_signal(struct pt_regs *regs, sigset_t *oldset); #define ptrace_signal_deliver(regs, cookie) do { } while (0) |