This patch moves all the the symbols defined in um_arch.c, which are
mostly boundaries between different parts of the UML kernel address
space, to a new header, as-layout.h. There are also a few things here
which aren't really related to address space layout, but which don't
really have a better place to go.
Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
--
arch/um/include/as-layout.h | 35 +++
arch/um/include/user_util.h | 23 ---
arch/um/kernel/exec.c |1 +
arch/um/kernel/ksyms.c|1 +
arch/um/kernel/mem.c |1 +
arch/um/kernel/physmem.c |1 +
arch/um/kernel/process.c |1 +
arch/um/kernel/skas/process.c |1 +
arch/um/kernel/tlb.c |1 +
arch/um/kernel/trap.c |1 +
arch/um/kernel/um_arch.c |1 +
arch/um/os-Linux/main.c |1 +
arch/um/os-Linux/skas/trap.c |1 +
13 files changed, 46 insertions(+), 23 deletions(-)
Index: linux-2.6.21-mm/arch/um/kernel/exec.c
===
--- linux-2.6.21-mm.orig/arch/um/kernel/exec.c 2007-03-21 17:33:45.0
-0400
+++ linux-2.6.21-mm/arch/um/kernel/exec.c 2007-03-22 11:18:21.0
-0400
@@ -12,6 +12,7 @@
#include "asm/uaccess.h"
#include "user_util.h"
#include "kern_util.h"
+#include "as-layout.h"
#include "mem_user.h"
#include "kern.h"
#include "irq_user.h"
Index: linux-2.6.21-mm/arch/um/kernel/mem.c
===
--- linux-2.6.21-mm.orig/arch/um/kernel/mem.c 2007-03-21 17:33:45.0
-0400
+++ linux-2.6.21-mm/arch/um/kernel/mem.c2007-03-22 11:18:21.0
-0400
@@ -15,6 +15,7 @@
#include "asm/pgalloc.h"
#include "user_util.h"
#include "kern_util.h"
+#include "as-layout.h"
#include "kern.h"
#include "mem_user.h"
#include "uml_uaccess.h"
Index: linux-2.6.21-mm/arch/um/kernel/process.c
===
--- linux-2.6.21-mm.orig/arch/um/kernel/process.c 2007-03-21
17:33:45.0 -0400
+++ linux-2.6.21-mm/arch/um/kernel/process.c2007-03-22 11:18:21.0
-0400
@@ -34,6 +34,7 @@
#include "asm/user.h"
#include "user_util.h"
#include "kern_util.h"
+#include "as-layout.h"
#include "kern.h"
#include "signal_kern.h"
#include "init.h"
Index: linux-2.6.21-mm/arch/um/kernel/skas/process.c
===
--- linux-2.6.21-mm.orig/arch/um/kernel/skas/process.c 2007-03-21
17:33:45.0 -0400
+++ linux-2.6.21-mm/arch/um/kernel/skas/process.c 2007-03-22
11:18:21.0 -0400
@@ -13,6 +13,7 @@
#include "asm/uaccess.h"
#include "asm/atomic.h"
#include "kern_util.h"
+#include "as-layout.h"
#include "skas.h"
#include "os.h"
#include "user_util.h"
Index: linux-2.6.21-mm/arch/um/os-Linux/main.c
===
--- linux-2.6.21-mm.orig/arch/um/os-Linux/main.c2007-03-21
17:33:45.0 -0400
+++ linux-2.6.21-mm/arch/um/os-Linux/main.c 2007-03-22 11:18:21.0
-0400
@@ -15,6 +15,7 @@
#include
#include "user_util.h"
#include "kern_util.h"
+#include "as-layout.h"
#include "mem_user.h"
#include "irq_user.h"
#include "user.h"
Index: linux-2.6.21-mm/arch/um/os-Linux/skas/trap.c
===
--- linux-2.6.21-mm.orig/arch/um/os-Linux/skas/trap.c 2007-03-21
17:33:45.0 -0400
+++ linux-2.6.21-mm/arch/um/os-Linux/skas/trap.c2007-03-22
11:18:21.0 -0400
@@ -7,6 +7,7 @@
#include
#include "user_util.h"
#include "kern_util.h"
+#include "as-layout.h"
#include "task.h"
#include "sigcontext.h"
#include "skas.h"
Index: linux-2.6.21-mm/arch/um/kernel/physmem.c
===
--- linux-2.6.21-mm.orig/arch/um/kernel/physmem.c 2007-03-21
17:33:45.0 -0400
+++ linux-2.6.21-mm/arch/um/kernel/physmem.c2007-03-22 11:18:21.0
-0400
@@ -13,6 +13,7 @@
#include "asm/types.h"
#include "asm/pgtable.h"
#include "kern_util.h"
+#include "as-layout.h"
#include "user_util.h"
#include "mode_kern.h"
#include "mem.h"
Index: linux-2.6.21-mm/arch/um/kernel/tlb.c
===
--- linux-2.6.21-mm.orig/arch/um/kernel/tlb.c 2007-03-21 17:33:45.0
-0400
+++ linux-2.6.21-mm/arch/um/kernel/tlb.c2007-03-22 11:18:21.0
-0400
@@ -9,6 +9,7 @@
#include "asm/tlbflush.h"
#include "choose-mode.h"
#include "mode_kern.h"
+#include "as-layout.h"
#include "user_util.h"
#include "tlb.h"
#include "mem.h"
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 17:38:21.0
-0400
+++ linux-2.6.21-mm/arch/um/kernel/trap.c 2007-03-22 11:18