diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-08-18 00:12:41 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-10-22 22:55:20 -0700 |
| commit | 2e074004c6b71a93c8e08c0dd5e3cec0b92ad0e5 (patch) | |
| tree | bfedef385052b53c07aecfe4ccb2eba9f25bc951 | |
| parent | 3be311e324087d94050010b97821b9d77a45e92f (diff) | |
| download | op-kernel-dev-2e074004c6b71a93c8e08c0dd5e3cec0b92ad0e5.zip op-kernel-dev-2e074004c6b71a93c8e08c0dd5e3cec0b92ad0e5.tar.gz | |
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>
| -rw-r--r-- | arch/powerpc/include/asm/signal.h | 1 | ||||
| -rw-r--r-- | arch/powerpc/kernel/signal.h | 2 | ||||
| -rw-r--r-- | arch/um/include/asm/signal.h | 29 |
3 files changed, 2 insertions, 30 deletions
diff --git a/arch/powerpc/include/asm/signal.h b/arch/powerpc/include/asm/signal.h index a7360cd..69f709d 100644 --- a/arch/powerpc/include/asm/signal.h +++ b/arch/powerpc/include/asm/signal.h @@ -122,7 +122,6 @@ typedef struct sigaltstack { #ifdef __KERNEL__ struct pt_regs; -extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags); #define ptrace_signal_deliver(regs, cookie) do { } while (0) #endif /* __KERNEL__ */ diff --git a/arch/powerpc/kernel/signal.h b/arch/powerpc/kernel/signal.h index 28f4b9f..b427bf8 100644 --- a/arch/powerpc/kernel/signal.h +++ b/arch/powerpc/kernel/signal.h @@ -12,6 +12,8 @@ #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) +extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags); + extern void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size); extern void restore_sigmask(sigset_t *set); diff --git a/arch/um/include/asm/signal.h b/arch/um/include/asm/signal.h deleted file mode 100644 index 52ed92c..0000000 --- a/arch/um/include/asm/signal.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) - * Licensed under the GPL - */ - -#ifndef __UM_SIGNAL_H -#define __UM_SIGNAL_H - -/* Need to kill the do_signal() declaration in the i386 signal.h */ - -#define do_signal do_signal_renamed -#include "asm/arch/signal.h" -#undef do_signal -#undef ptrace_signal_deliver - -#define ptrace_signal_deliver(regs, cookie) do {} while(0) - -#endif - -/* - * Overrides for Emacs so that we follow Linus's tabbing style. - * Emacs will notice this stuff at the end of the file and automatically - * adjust the settings for this buffer only. This must remain at the end - * of the file. - * --------------------------------------------------------------------------- - * Local variables: - * c-file-style: "linux" - * End: - */ |
