diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-05-06 17:51:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:13:01 -0400 |
commit | 4ff83ce1114827f707b7f1f4f2e5f69de9df94ac (patch) | |
tree | c810839d94475729bd235fe1b39c03298b667fb4 | |
parent | eb8307595baa729a12db0fec9a80910b13bd6fc8 (diff) |
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 <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/um/include/as-layout.h | 35 | ||||
-rw-r--r-- | arch/um/include/user_util.h | 23 | ||||
-rw-r--r-- | arch/um/kernel/exec.c | 1 | ||||
-rw-r--r-- | arch/um/kernel/ksyms.c | 1 | ||||
-rw-r--r-- | arch/um/kernel/mem.c | 1 | ||||
-rw-r--r-- | arch/um/kernel/physmem.c | 1 | ||||
-rw-r--r-- | arch/um/kernel/process.c | 1 | ||||
-rw-r--r-- | arch/um/kernel/skas/process.c | 1 | ||||
-rw-r--r-- | arch/um/kernel/tlb.c | 1 | ||||
-rw-r--r-- | arch/um/kernel/trap.c | 1 | ||||
-rw-r--r-- | arch/um/kernel/um_arch.c | 1 | ||||
-rw-r--r-- | arch/um/os-Linux/main.c | 1 | ||||
-rw-r--r-- | arch/um/os-Linux/skas/trap.c | 1 |
13 files changed, 46 insertions, 23 deletions
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 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __START_H__ | ||
7 | #define __START_H__ | ||
8 | |||
9 | #include "sysdep/ptrace.h" | ||
10 | |||
11 | struct cpu_task { | ||
12 | int pid; | ||
13 | void *task; | ||
14 | }; | ||
15 | |||
16 | extern struct cpu_task cpu_tasks[]; | ||
17 | |||
18 | extern unsigned long low_physmem; | ||
19 | extern unsigned long high_physmem; | ||
20 | extern unsigned long uml_physmem; | ||
21 | extern unsigned long uml_reserved; | ||
22 | extern unsigned long end_vm; | ||
23 | extern unsigned long start_vm; | ||
24 | extern unsigned long long highmem; | ||
25 | |||
26 | extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end; | ||
27 | extern unsigned long _unprotected_end; | ||
28 | extern unsigned long brk_start; | ||
29 | |||
30 | extern int linux_main(int argc, char **argv); | ||
31 | extern void set_cmdline(char *cmd); | ||
32 | |||
33 | extern void (*sig_info[])(int, union uml_pt_regs *); | ||
34 | |||
35 | #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); | |||
30 | extern int unlockpt(int __fd); | 30 | extern int unlockpt(int __fd); |
31 | extern char *ptsname(int __fd); | 31 | extern char *ptsname(int __fd); |
32 | 32 | ||
33 | struct cpu_task { | ||
34 | int pid; | ||
35 | void *task; | ||
36 | }; | ||
37 | |||
38 | extern struct cpu_task cpu_tasks[]; | ||
39 | |||
40 | extern void (*sig_info[])(int, union uml_pt_regs *); | ||
41 | |||
42 | extern unsigned long low_physmem; | ||
43 | extern unsigned long high_physmem; | ||
44 | extern unsigned long uml_physmem; | ||
45 | extern unsigned long uml_reserved; | ||
46 | extern unsigned long end_vm; | ||
47 | extern unsigned long start_vm; | ||
48 | extern unsigned long long highmem; | ||
49 | |||
50 | extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end; | ||
51 | extern unsigned long _unprotected_end; | ||
52 | extern unsigned long brk_start; | ||
53 | |||
54 | extern void *add_signal_handler(int sig, void (*handler)(int)); | 33 | extern void *add_signal_handler(int sig, void (*handler)(int)); |
55 | extern int linux_main(int argc, char **argv); | ||
56 | extern void set_cmdline(char *cmd); | ||
57 | extern void input_cb(void (*proc)(void *), void *arg, int arg_len); | 34 | extern void input_cb(void (*proc)(void *), void *arg, int arg_len); |
58 | extern int get_pty(void); | 35 | extern int get_pty(void); |
59 | extern int switcheroo(int fd, int prot, void *from, void *to, int size); | 36 | 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 @@ | |||
12 | #include "asm/uaccess.h" | 12 | #include "asm/uaccess.h" |
13 | #include "user_util.h" | 13 | #include "user_util.h" |
14 | #include "kern_util.h" | 14 | #include "kern_util.h" |
15 | #include "as-layout.h" | ||
15 | #include "mem_user.h" | 16 | #include "mem_user.h" |
16 | #include "kern.h" | 17 | #include "kern.h" |
17 | #include "irq_user.h" | 18 | #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 @@ | |||
16 | #include "asm/page.h" | 16 | #include "asm/page.h" |
17 | #include "asm/tlbflush.h" | 17 | #include "asm/tlbflush.h" |
18 | #include "kern_util.h" | 18 | #include "kern_util.h" |
19 | #include "as-layout.h" | ||
19 | #include "user_util.h" | 20 | #include "user_util.h" |
20 | #include "mem_user.h" | 21 | #include "mem_user.h" |
21 | #include "os.h" | 22 | #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 @@ | |||
15 | #include "asm/pgalloc.h" | 15 | #include "asm/pgalloc.h" |
16 | #include "user_util.h" | 16 | #include "user_util.h" |
17 | #include "kern_util.h" | 17 | #include "kern_util.h" |
18 | #include "as-layout.h" | ||
18 | #include "kern.h" | 19 | #include "kern.h" |
19 | #include "mem_user.h" | 20 | #include "mem_user.h" |
20 | #include "uml_uaccess.h" | 21 | #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 @@ | |||
13 | #include "asm/types.h" | 13 | #include "asm/types.h" |
14 | #include "asm/pgtable.h" | 14 | #include "asm/pgtable.h" |
15 | #include "kern_util.h" | 15 | #include "kern_util.h" |
16 | #include "as-layout.h" | ||
16 | #include "user_util.h" | 17 | #include "user_util.h" |
17 | #include "mode_kern.h" | 18 | #include "mode_kern.h" |
18 | #include "mem.h" | 19 | #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 @@ | |||
34 | #include "asm/user.h" | 34 | #include "asm/user.h" |
35 | #include "user_util.h" | 35 | #include "user_util.h" |
36 | #include "kern_util.h" | 36 | #include "kern_util.h" |
37 | #include "as-layout.h" | ||
37 | #include "kern.h" | 38 | #include "kern.h" |
38 | #include "signal_kern.h" | 39 | #include "signal_kern.h" |
39 | #include "init.h" | 40 | #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 @@ | |||
13 | #include "asm/uaccess.h" | 13 | #include "asm/uaccess.h" |
14 | #include "asm/atomic.h" | 14 | #include "asm/atomic.h" |
15 | #include "kern_util.h" | 15 | #include "kern_util.h" |
16 | #include "as-layout.h" | ||
16 | #include "skas.h" | 17 | #include "skas.h" |
17 | #include "os.h" | 18 | #include "os.h" |
18 | #include "user_util.h" | 19 | #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 @@ | |||
9 | #include "asm/tlbflush.h" | 9 | #include "asm/tlbflush.h" |
10 | #include "choose-mode.h" | 10 | #include "choose-mode.h" |
11 | #include "mode_kern.h" | 11 | #include "mode_kern.h" |
12 | #include "as-layout.h" | ||
12 | #include "user_util.h" | 13 | #include "user_util.h" |
13 | #include "tlb.h" | 14 | #include "tlb.h" |
14 | #include "mem.h" | 15 | #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 @@ | |||
20 | #include "sysdep/sigcontext.h" | 20 | #include "sysdep/sigcontext.h" |
21 | #include "user_util.h" | 21 | #include "user_util.h" |
22 | #include "kern_util.h" | 22 | #include "kern_util.h" |
23 | #include "as-layout.h" | ||
23 | #include "arch.h" | 24 | #include "arch.h" |
24 | #include "kern.h" | 25 | #include "kern.h" |
25 | #include "chan_kern.h" | 26 | #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 @@ | |||
28 | #include "asm/current.h" | 28 | #include "asm/current.h" |
29 | #include "user_util.h" | 29 | #include "user_util.h" |
30 | #include "kern_util.h" | 30 | #include "kern_util.h" |
31 | #include "as-layout.h" | ||
31 | #include "arch.h" | 32 | #include "arch.h" |
32 | #include "kern.h" | 33 | #include "kern.h" |
33 | #include "mem_user.h" | 34 | #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 @@ | |||
15 | #include <asm/page.h> | 15 | #include <asm/page.h> |
16 | #include "user_util.h" | 16 | #include "user_util.h" |
17 | #include "kern_util.h" | 17 | #include "kern_util.h" |
18 | #include "as-layout.h" | ||
18 | #include "mem_user.h" | 19 | #include "mem_user.h" |
19 | #include "irq_user.h" | 20 | #include "irq_user.h" |
20 | #include "user.h" | 21 | #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 @@ | |||
7 | #include <errno.h> | 7 | #include <errno.h> |
8 | #include "user_util.h" | 8 | #include "user_util.h" |
9 | #include "kern_util.h" | 9 | #include "kern_util.h" |
10 | #include "as-layout.h" | ||
10 | #include "task.h" | 11 | #include "task.h" |
11 | #include "sigcontext.h" | 12 | #include "sigcontext.h" |
12 | #include "skas.h" | 13 | #include "skas.h" |