aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/kernel/um_arch.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index cfa35763405f..9bf31533a8fd 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -44,7 +44,7 @@
44 44
45#define DEFAULT_COMMAND_LINE "root=98:0" 45#define DEFAULT_COMMAND_LINE "root=98:0"
46 46
47/* Changed in linux_main and setup_arch, which run before SMP is started */ 47/* Changed in add_arg and setup_arch, which run before SMP is started */
48static char __initdata command_line[COMMAND_LINE_SIZE] = { 0 }; 48static char __initdata command_line[COMMAND_LINE_SIZE] = { 0 };
49 49
50static void __init add_arg(char *arg) 50static void __init add_arg(char *arg)
@@ -58,7 +58,12 @@ static void __init add_arg(char *arg)
58 strcat(command_line, arg); 58 strcat(command_line, arg);
59} 59}
60 60
61struct cpuinfo_um boot_cpu_data = { 61/*
62 * These fields are initialized at boot time and not changed.
63 * XXX This structure is used only in the non-SMP case. Maybe this
64 * should be moved to smp.c.
65 */
66struct cpuinfo_um boot_cpu_data = {
62 .loops_per_jiffy = 0, 67 .loops_per_jiffy = 0,
63 .ipi_pipe = { -1, -1 } 68 .ipi_pipe = { -1, -1 }
64}; 69};
@@ -119,14 +124,12 @@ const struct seq_operations cpuinfo_op = {
119/* Set in linux_main */ 124/* Set in linux_main */
120unsigned long host_task_size; 125unsigned long host_task_size;
121unsigned long task_size; 126unsigned long task_size;
122
123unsigned long uml_start;
124
125/* Set in early boot */
126unsigned long uml_physmem; 127unsigned long uml_physmem;
127unsigned long uml_reserved; 128unsigned long uml_reserved; /* Also modified in mem_init */
128unsigned long start_vm; 129unsigned long start_vm;
129unsigned long end_vm; 130unsigned long end_vm;
131
132/* Set in uml_ncpus_setup */
130int ncpus = 1; 133int ncpus = 1;
131 134
132#ifdef CONFIG_CMDLINE_ON_HOST 135#ifdef CONFIG_CMDLINE_ON_HOST
@@ -140,6 +143,8 @@ static char *argv1_end = NULL;
140 143
141/* Set in early boot */ 144/* Set in early boot */
142static int have_root __initdata = 0; 145static int have_root __initdata = 0;
146
147/* Set in uml_mem_setup and modified in linux_main */
143long long physmem_size = 32 * 1024 * 1024; 148long long physmem_size = 32 * 1024 * 1024;
144 149
145void set_cmdline(char *cmd) 150void set_cmdline(char *cmd)
@@ -378,7 +383,6 @@ int __init linux_main(int argc, char **argv)
378 383
379 printf("UML running in %s mode\n", mode); 384 printf("UML running in %s mode\n", mode);
380 385
381 uml_start = (unsigned long) &__binary_start;
382 host_task_size = CHOOSE_MODE_PROC(set_task_sizes_tt, 386 host_task_size = CHOOSE_MODE_PROC(set_task_sizes_tt,
383 set_task_sizes_skas, &task_size); 387 set_task_sizes_skas, &task_size);
384 388
@@ -400,7 +404,7 @@ int __init linux_main(int argc, char **argv)
400 physmem_size += UML_ROUND_UP(brk_start) - UML_ROUND_UP(&_end); 404 physmem_size += UML_ROUND_UP(brk_start) - UML_ROUND_UP(&_end);
401 } 405 }
402 406
403 uml_physmem = uml_start & PAGE_MASK; 407 uml_physmem = (unsigned long) &__binary_start & PAGE_MASK;
404 408
405 /* Reserve up to 4M after the current brk */ 409 /* Reserve up to 4M after the current brk */
406 uml_reserved = ROUND_4M(brk_start) + (1 << 22); 410 uml_reserved = ROUND_4M(brk_start) + (1 << 22);