Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e074004 authored by Al Viro's avatar Al Viro Committed by H. Peter Anvin
Browse files

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 3be311e3

arch/powerpc/include/asm/signal.h

+0 −1
Original line number Diff line number Diff line
@@ -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__ */

arch/powerpc/kernel/signal.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

arch/um/include/asm/signal.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/* 

 * 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:

 */