提交 2e074004 编写于 作者: A Al Viro 提交者: H. Peter Anvin

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: NAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: NH. Peter Anvin <hpa@zytor.com>
上级 3be311e3
...@@ -122,7 +122,6 @@ typedef struct sigaltstack { ...@@ -122,7 +122,6 @@ typedef struct sigaltstack {
#ifdef __KERNEL__ #ifdef __KERNEL__
struct pt_regs; 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) #define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) #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, extern void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
size_t frame_size); size_t frame_size);
extern void restore_sigmask(sigset_t *set); extern void restore_sigmask(sigset_t *set);
......
/*
* 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:
*/
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册