Commit 2e074004c6b71a93c8e08c0dd5e3cec0b92ad0e5
Committed by
H. Peter Anvin
H. Peter Anvin
1 parent
3be311e324
Exists in
master
and in
7 other branches
x86, um: get rid of uml signal.h
the only theoretical reason for it these days is ppc; aside of uml/ppc being dead, do_signal() would be happier in arch/powerpc/kernel/signal.h anyway. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Showing 3 changed files with 2 additions and 30 deletions Side-by-side Diff
arch/powerpc/include/asm/signal.h
arch/powerpc/kernel/signal.h
| ... | ... | @@ -12,6 +12,8 @@ |
| 12 | 12 | |
| 13 | 13 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) |
| 14 | 14 | |
| 15 | +extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags); | |
| 16 | + | |
| 15 | 17 | extern void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, |
| 16 | 18 | size_t frame_size); |
| 17 | 19 | extern void restore_sigmask(sigset_t *set); |
arch/um/include/asm/signal.h
| 1 | -/* | |
| 2 | - * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) | |
| 3 | - * Licensed under the GPL | |
| 4 | - */ | |
| 5 | - | |
| 6 | -#ifndef __UM_SIGNAL_H | |
| 7 | -#define __UM_SIGNAL_H | |
| 8 | - | |
| 9 | -/* Need to kill the do_signal() declaration in the i386 signal.h */ | |
| 10 | - | |
| 11 | -#define do_signal do_signal_renamed | |
| 12 | -#include "asm/arch/signal.h" | |
| 13 | -#undef do_signal | |
| 14 | -#undef ptrace_signal_deliver | |
| 15 | - | |
| 16 | -#define ptrace_signal_deliver(regs, cookie) do {} while(0) | |
| 17 | - | |
| 18 | -#endif | |
| 19 | - | |
| 20 | -/* | |
| 21 | - * Overrides for Emacs so that we follow Linus's tabbing style. | |
| 22 | - * Emacs will notice this stuff at the end of the file and automatically | |
| 23 | - * adjust the settings for this buffer only. This must remain at the end | |
| 24 | - * of the file. | |
| 25 | - * --------------------------------------------------------------------------- | |
| 26 | - * Local variables: | |
| 27 | - * c-file-style: "linux" | |
| 28 | - * End: | |
| 29 | - */ |