aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-08-17 23:58:32 -0400
committerH. Peter Anvin <hpa@zytor.com>2008-10-23 01:55:20 -0400
commit3be311e324087d94050010b97821b9d77a45e92f (patch)
treeaa79e6ac750d5327fd4a4221e84600386dea1659 /arch/um
parent1de1502c96c3c163c06419bfe838c73632fa8d9c (diff)
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 <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/Makefile2
-rw-r--r--arch/um/include/asm/sigcontext-generic.h6
-rw-r--r--arch/um/include/asm/sigcontext-i386.h6
-rw-r--r--arch/um/include/asm/sigcontext-ppc.h10
-rw-r--r--arch/um/include/asm/sigcontext-x86_64.h22
-rw-r--r--arch/um/include/shared/sigcontext.h25
-rw-r--r--arch/um/kernel/signal.c2
7 files changed, 2 insertions, 71 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 3474b105ee6d..33d59f1ff57f 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -19,7 +19,7 @@ core-y += $(ARCH_DIR)/kernel/ \
19 $(ARCH_DIR)/os-$(OS)/ 19 $(ARCH_DIR)/os-$(OS)/
20 20
21# Have to precede the include because the included Makefiles reference them. 21# Have to precede the include because the included Makefiles reference them.
22SYMLINK_HEADERS := archparam.h system.h sigcontext.h processor.h ptrace.h \ 22SYMLINK_HEADERS := archparam.h system.h processor.h ptrace.h \
23 module.h vm-flags.h elf.h host_ldt.h 23 module.h vm-flags.h elf.h host_ldt.h
24SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$(header)) 24SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$(header))
25 25
diff --git a/arch/um/include/asm/sigcontext-generic.h b/arch/um/include/asm/sigcontext-generic.h
deleted file mode 100644
index 164587014c61..000000000000
--- a/arch/um/include/asm/sigcontext-generic.h
+++ /dev/null
@@ -1,6 +0,0 @@
1#ifndef __UM_SIGCONTEXT_GENERIC_H
2#define __UM_SIGCONTEXT_GENERIC_H
3
4#include "asm/arch/sigcontext.h"
5
6#endif
diff --git a/arch/um/include/asm/sigcontext-i386.h b/arch/um/include/asm/sigcontext-i386.h
deleted file mode 100644
index b88333f488bb..000000000000
--- a/arch/um/include/asm/sigcontext-i386.h
+++ /dev/null
@@ -1,6 +0,0 @@
1#ifndef __UM_SIGCONTEXT_I386_H
2#define __UM_SIGCONTEXT_I386_H
3
4#include "asm/sigcontext-generic.h"
5
6#endif
diff --git a/arch/um/include/asm/sigcontext-ppc.h b/arch/um/include/asm/sigcontext-ppc.h
deleted file mode 100644
index 2467f20eda99..000000000000
--- a/arch/um/include/asm/sigcontext-ppc.h
+++ /dev/null
@@ -1,10 +0,0 @@
1#ifndef __UM_SIGCONTEXT_PPC_H
2#define __UM_SIGCONTEXT_PPC_H
3
4#define pt_regs sys_pt_regs
5
6#include "asm/sigcontext-generic.h"
7
8#undef pt_regs
9
10#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 b600e0b01e48..000000000000
--- a/arch/um/include/asm/sigcontext-x86_64.h
+++ /dev/null
@@ -1,22 +0,0 @@
1/* Copyright 2003 PathScale, Inc.
2 *
3 * Licensed under the GPL
4 */
5
6#ifndef __UM_SIGCONTEXT_X86_64_H
7#define __UM_SIGCONTEXT_X86_64_H
8
9#include "asm/sigcontext-generic.h"
10
11#endif
12
13/*
14 * Overrides for Emacs so that we follow Linus's tabbing style.
15 * Emacs will notice this stuff at the end of the file and automatically
16 * adjust the settings for this buffer only. This must remain at the end
17 * of the file.
18 * ---------------------------------------------------------------------------
19 * Local variables:
20 * c-file-style: "linux"
21 * End:
22 */
diff --git a/arch/um/include/shared/sigcontext.h b/arch/um/include/shared/sigcontext.h
deleted file mode 100644
index 59816ca7a8df..000000000000
--- a/arch/um/include/shared/sigcontext.h
+++ /dev/null
@@ -1,25 +0,0 @@
1/*
2 * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
3 * Licensed under the GPL
4 */
5
6#ifndef __UML_SIGCONTEXT_H__
7#define __UML_SIGCONTEXT_H__
8
9#include "sysdep/sigcontext.h"
10
11extern int sc_size(void *data);
12extern void sc_to_sc(void *to_ptr, void *from_ptr);
13
14#endif
15
16/*
17 * Overrides for Emacs so that we follow Linus's tabbing style.
18 * Emacs will notice this stuff at the end of the file and automatically
19 * adjust the settings for this buffer only. This must remain at the end
20 * of the file.
21 * ---------------------------------------------------------------------------
22 * Local variables:
23 * c-file-style: "linux"
24 * End:
25 */
diff --git a/arch/um/kernel/signal.c b/arch/um/kernel/signal.c
index b0fce720c4d0..b5c094c4ade4 100644
--- a/arch/um/kernel/signal.c
+++ b/arch/um/kernel/signal.c
@@ -11,7 +11,7 @@
11#include <asm/unistd.h> 11#include <asm/unistd.h>
12#include "frame_kern.h" 12#include "frame_kern.h"
13#include "kern_util.h" 13#include "kern_util.h"
14#include "sigcontext.h" 14#include <sysdep/sigcontext.h>
15 15
16EXPORT_SYMBOL(block_signals); 16EXPORT_SYMBOL(block_signals);
17EXPORT_SYMBOL(unblock_signals); 17EXPORT_SYMBOL(unblock_signals);