diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
| commit | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (patch) | |
| tree | 316436f77dac75335fd2c3ef5f109e71606c50d3 /include/asm-powerpc/signal.h | |
| parent | b6d4f7e3ef25beb8c658c97867d98883e69dc544 (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-powerpc/signal.h')
| -rw-r--r-- | include/asm-powerpc/signal.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-powerpc/signal.h b/include/asm-powerpc/signal.h index a8c7babf4950..a7360cdd99eb 100644 --- a/include/asm-powerpc/signal.h +++ b/include/asm-powerpc/signal.h | |||
| @@ -122,8 +122,7 @@ typedef struct sigaltstack { | |||
| 122 | 122 | ||
| 123 | #ifdef __KERNEL__ | 123 | #ifdef __KERNEL__ |
| 124 | struct pt_regs; | 124 | struct pt_regs; |
| 125 | extern int do_signal(sigset_t *oldset, struct pt_regs *regs); | 125 | extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags); |
| 126 | extern int do_signal32(sigset_t *oldset, struct pt_regs *regs); | ||
| 127 | #define ptrace_signal_deliver(regs, cookie) do { } while (0) | 126 | #define ptrace_signal_deliver(regs, cookie) do { } while (0) |
| 128 | #endif /* __KERNEL__ */ | 127 | #endif /* __KERNEL__ */ |
| 129 | 128 | ||