[ PATCH 3/7 ] UML - Create arch.h

From: Jeff Dike
Date: Thu Mar 22 2007 - 12:10:05 EST


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 <jdike@xxxxxxxxxxxxxxx>
--
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(-)

Index: linux-2.6.21-mm/arch/um/include/arch.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.21-mm/arch/um/include/arch.h 2007-03-21 17:29:15.000000000 -0400
@@ -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
Index: linux-2.6.21-mm/arch/um/kernel/trap.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/kernel/trap.c 2007-03-21 16:16:43.000000000 -0400
+++ linux-2.6.21-mm/arch/um/kernel/trap.c 2007-03-21 17:29:15.000000000 -0400
@@ -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"
Index: linux-2.6.21-mm/arch/um/kernel/um_arch.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/kernel/um_arch.c 2007-03-21 16:16:43.000000000 -0400
+++ linux-2.6.21-mm/arch/um/kernel/um_arch.c 2007-03-21 17:29:15.000000000 -0400
@@ -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"
Index: linux-2.6.21-mm/arch/um/include/user_util.h
===================================================================
--- linux-2.6.21-mm.orig/arch/um/include/user_util.h 2007-03-21 16:17:50.000000000 -0400
+++ linux-2.6.21-mm/arch/um/include/user_util.h 2007-03-21 17:29:15.000000000 -0400
@@ -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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/