From 4ff83ce1114827f707b7f1f4f2e5f69de9df94ac Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Sun, 6 May 2007 14:51:08 -0700 Subject: [PATCH] uml: create as-layout.h 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 Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- 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(-) create mode 100644 arch/um/include/as-layout.h diff --git a/arch/um/include/as-layout.h b/arch/um/include/as-layout.h new file mode 100644 index 000000000000..fccf187bf4e1 --- /dev/null +++ b/arch/um/include/as-layout.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) + * Licensed under the GPL + */ + +#ifndef __START_H__ +#define __START_H__ + +#include "sysdep/ptrace.h" + +struct cpu_task { + int pid; + void *task; +}; + +extern struct cpu_task cpu_tasks[]; + +extern unsigned long low_physmem; +extern unsigned long high_physmem; +extern unsigned long uml_physmem; +extern unsigned long uml_reserved; +extern unsigned long end_vm; +extern unsigned long start_vm; +extern unsigned long long highmem; + +extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end; +extern unsigned long _unprotected_end; +extern unsigned long brk_start; + +extern int linux_main(int argc, char **argv); +extern void set_cmdline(char *cmd); + +extern void (*sig_info[])(int, union uml_pt_regs *); + +#endif diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h index fabad2372af0..f04776e2436f 100644 --- a/arch/um/include/user_util.h +++ b/arch/um/include/user_util.h @@ -30,30 +30,7 @@ extern int grantpt(int __fd); extern int unlockpt(int __fd); extern char *ptsname(int __fd); -struct cpu_task { - int pid; - void *task; -}; - -extern struct cpu_task cpu_tasks[]; - -extern void (*sig_info[])(int, union uml_pt_regs *); - -extern unsigned long low_physmem; -extern unsigned long high_physmem; -extern unsigned long uml_physmem; -extern unsigned long uml_reserved; -extern unsigned long end_vm; -extern unsigned long start_vm; -extern unsigned long long highmem; - -extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end; -extern unsigned long _unprotected_end; -extern unsigned long brk_start; - extern void *add_signal_handler(int sig, void (*handler)(int)); -extern int linux_main(int argc, char **argv); -extern void set_cmdline(char *cmd); extern void input_cb(void (*proc)(void *), void *arg, int arg_len); extern int get_pty(void); extern int switcheroo(int fd, int prot, void *from, void *to, int size); diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c index 121166400e25..1ada13ea84e4 100644 --- a/arch/um/kernel/exec.c +++ b/arch/um/kernel/exec.c @@ -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" diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c index 0e00cf93f900..288b4ee2041a 100644 --- a/arch/um/kernel/ksyms.c +++ b/arch/um/kernel/ksyms.c @@ -16,6 +16,7 @@ #include "asm/page.h" #include "asm/tlbflush.h" #include "kern_util.h" +#include "as-layout.h" #include "user_util.h" #include "mem_user.h" #include "os.h" diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index df7d662b98ce..3a13d41c28d0 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c @@ -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" diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c index 638f3b5f6094..f92f06c35db7 100644 --- a/arch/um/kernel/physmem.c +++ b/arch/um/kernel/physmem.c @@ -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" diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 348b272bb766..e4208386e7af 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -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" diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c index ae4fa71d3b8b..9c2a7d8c56fb 100644 --- a/arch/um/kernel/skas/process.c +++ b/arch/um/kernel/skas/process.c @@ -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" diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c index 54a5ff25645a..b8b3cff0668a 100644 --- a/arch/um/kernel/tlb.c +++ b/arch/um/kernel/tlb.c @@ -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" diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c index e27b898412fc..552bcfc7c085 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 "as-layout.h" #include "arch.h" #include "kern.h" #include "chan_kern.h" diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 8eefb5202c50..20684c04d5d5 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 "as-layout.h" #include "arch.h" #include "kern.h" #include "mem_user.h" diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c index 2c089c2c63bf..25261d6c7bf2 100644 --- a/arch/um/os-Linux/main.c +++ b/arch/um/os-Linux/main.c @@ -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" diff --git a/arch/um/os-Linux/skas/trap.c b/arch/um/os-Linux/skas/trap.c index 9ad5fbec4593..19ff04bdec90 100644 --- a/arch/um/os-Linux/skas/trap.c +++ b/arch/um/os-Linux/skas/trap.c @@ -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"