From eb8307595baa729a12db0fec9a80910b13bd6fc8 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Sun, 6 May 2007 14:51:07 -0700 Subject: [PATCH] uml: create arch.h This patch moves the declarations of the architecture hooks from user_util.h to a new header, arch.c, and adds the necessary includes to files which need those declarations. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/um/include/arch.h | 15 +++++++++++++++ arch/um/include/user_util.h | 4 ---- arch/um/kernel/trap.c | 1 + arch/um/kernel/um_arch.c | 1 + 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 arch/um/include/arch.h diff --git a/arch/um/include/arch.h b/arch/um/include/arch.h new file mode 100644 index 000000000000..8e11dd7c1adb --- /dev/null +++ b/arch/um/include/arch.h @@ -0,0 +1,15 @@ +/* + * Copyright (C) 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) + * Licensed under the GPL + */ + +#ifndef __ARCH_H__ +#define __ARCH_H__ + +#include "sysdep/ptrace.h" + +extern void arch_check_bugs(void); +extern int arch_fixup(unsigned long address, void *sc_ptr); +extern int arch_handle_signal(int sig, union uml_pt_regs *regs); + +#endif diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h index df4869aa9406..fabad2372af0 100644 --- a/arch/um/include/user_util.h +++ b/arch/um/include/user_util.h @@ -65,10 +65,6 @@ extern int attach(int pid); extern void kill_child_dead(int pid); extern int cont(int pid); extern void check_sigio(void); -extern void arch_check_bugs(void); -extern int arch_handle_signal(int sig, union uml_pt_regs *regs); -extern int arch_fixup(unsigned long address, void *sc_ptr); -extern void arch_init_thread(void); extern int raw(int fd); #endif diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c index 26f15c458574..e27b898412fc 100644 --- a/arch/um/kernel/trap.c +++ b/arch/um/kernel/trap.c @@ -20,6 +20,7 @@ #include "sysdep/sigcontext.h" #include "user_util.h" #include "kern_util.h" +#include "arch.h" #include "kern.h" #include "chan_kern.h" #include "mconsole_kern.h" diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 613fb082bbd5..8eefb5202c50 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c @@ -28,6 +28,7 @@ #include "asm/current.h" #include "user_util.h" #include "kern_util.h" +#include "arch.h" #include "kern.h" #include "mem_user.h" #include "mem.h" -- 2.20.1