Commit 3be311e3 authored by Al Viro's avatar Al Viro Committed by H. Peter Anvin

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 1de1502c
...@@ -19,7 +19,7 @@ core-y += $(ARCH_DIR)/kernel/ \ ...@@ -19,7 +19,7 @@ core-y += $(ARCH_DIR)/kernel/ \
$(ARCH_DIR)/os-$(OS)/ $(ARCH_DIR)/os-$(OS)/
# Have to precede the include because the included Makefiles reference them. # 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 module.h vm-flags.h elf.h host_ldt.h
SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$(header)) SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$(header))
......
#ifndef __UM_SIGCONTEXT_GENERIC_H
#define __UM_SIGCONTEXT_GENERIC_H
#include "asm/arch/sigcontext.h"
#endif
#ifndef __UM_SIGCONTEXT_I386_H
#define __UM_SIGCONTEXT_I386_H
#include "asm/sigcontext-generic.h"
#endif
#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
/* 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:
*/
/*
* 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:
*/
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <asm/unistd.h> #include <asm/unistd.h>
#include "frame_kern.h" #include "frame_kern.h"
#include "kern_util.h" #include "kern_util.h"
#include "sigcontext.h" #include <sysdep/sigcontext.h>
EXPORT_SYMBOL(block_signals); EXPORT_SYMBOL(block_signals);
EXPORT_SYMBOL(unblock_signals); EXPORT_SYMBOL(unblock_signals);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment