From 3be311e324087d94050010b97821b9d77a45e92f Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 17 Aug 2008 23:58:32 -0400 Subject: x86, um: sanitize uml sigcontext.h uses a) the only difference between sigcontext and sysdep/sigcontext is that the former contains externs for two long-dead functions. Removed, switched the only user to sysdep/sigcontext b) asm/sigcontext.h is removable - that of underlying architecture would get used. Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin --- arch/um/Makefile | 2 +- arch/um/include/asm/sigcontext-generic.h | 6 ------ arch/um/include/asm/sigcontext-i386.h | 6 ------ arch/um/include/asm/sigcontext-ppc.h | 10 ---------- arch/um/include/asm/sigcontext-x86_64.h | 22 ---------------------- arch/um/include/shared/sigcontext.h | 25 ------------------------- arch/um/kernel/signal.c | 2 +- 7 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 arch/um/include/asm/sigcontext-generic.h delete mode 100644 arch/um/include/asm/sigcontext-i386.h delete mode 100644 arch/um/include/asm/sigcontext-ppc.h delete mode 100644 arch/um/include/asm/sigcontext-x86_64.h delete mode 100644 arch/um/include/shared/sigcontext.h diff --git a/arch/um/Makefile b/arch/um/Makefile index 3474b105ee6..33d59f1ff57 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -19,7 +19,7 @@ core-y += $(ARCH_DIR)/kernel/ \ $(ARCH_DIR)/os-$(OS)/ # Have to precede the include because the included Makefiles reference them. -SYMLINK_HEADERS := archparam.h system.h sigcontext.h processor.h ptrace.h \ +SYMLINK_HEADERS := archparam.h system.h processor.h ptrace.h \ module.h vm-flags.h elf.h host_ldt.h SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$(header)) diff --git a/arch/um/include/asm/sigcontext-generic.h b/arch/um/include/asm/sigcontext-generic.h deleted file mode 100644 index 164587014c6..00000000000 --- a/arch/um/include/asm/sigcontext-generic.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __UM_SIGCONTEXT_GENERIC_H -#define __UM_SIGCONTEXT_GENERIC_H - -#include "asm/arch/sigcontext.h" - -#endif diff --git a/arch/um/include/asm/sigcontext-i386.h b/arch/um/include/asm/sigcontext-i386.h deleted file mode 100644 index b88333f488b..00000000000 --- a/arch/um/include/asm/sigcontext-i386.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __UM_SIGCONTEXT_I386_H -#define __UM_SIGCONTEXT_I386_H - -#include "asm/sigcontext-generic.h" - -#endif diff --git a/arch/um/include/asm/sigcontext-ppc.h b/arch/um/include/asm/sigcontext-ppc.h deleted file mode 100644 index 2467f20eda9..00000000000 --- a/arch/um/include/asm/sigcontext-ppc.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __UM_SIGCONTEXT_PPC_H -#define __UM_SIGCONTEXT_PPC_H - -#define pt_regs sys_pt_regs - -#include "asm/sigcontext-generic.h" - -#undef pt_regs - -#endif diff --git a/arch/um/include/asm/sigcontext-x86_64.h b/arch/um/include/asm/sigcontext-x86_64.h deleted file mode 100644 index b600e0b01e4..00000000000 --- a/arch/um/include/asm/sigcontext-x86_64.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2003 PathScale, Inc. - * - * Licensed under the GPL - */ - -#ifndef __UM_SIGCONTEXT_X86_64_H -#define __UM_SIGCONTEXT_X86_64_H - -#include "asm/sigcontext-generic.h" - -#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: - */ diff --git a/arch/um/include/shared/sigcontext.h b/arch/um/include/shared/sigcontext.h deleted file mode 100644 index 59816ca7a8d..00000000000 --- a/arch/um/include/shared/sigcontext.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com) - * Licensed under the GPL - */ - -#ifndef __UML_SIGCONTEXT_H__ -#define __UML_SIGCONTEXT_H__ - -#include "sysdep/sigcontext.h" - -extern int sc_size(void *data); -extern void sc_to_sc(void *to_ptr, void *from_ptr); - -#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: - */ diff --git a/arch/um/kernel/signal.c b/arch/um/kernel/signal.c index b0fce720c4d..b5c094c4ade 100644 --- a/arch/um/kernel/signal.c +++ b/arch/um/kernel/signal.c @@ -11,7 +11,7 @@ #include #include "frame_kern.h" #include "kern_util.h" -#include "sigcontext.h" +#include EXPORT_SYMBOL(block_signals); EXPORT_SYMBOL(unblock_signals); -- cgit v1.2.3-70-g09d2