diff options
Diffstat (limited to 'arch/um/kernel/um_arch.c')
-rw-r--r-- | arch/um/kernel/um_arch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 93dc782dc1cc..142a9493912b 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c | |||
@@ -137,7 +137,7 @@ static char *argv1_end = NULL; | |||
137 | 137 | ||
138 | /* Set in early boot */ | 138 | /* Set in early boot */ |
139 | static int have_root __initdata = 0; | 139 | static int have_root __initdata = 0; |
140 | long physmem_size = 32 * 1024 * 1024; | 140 | long long physmem_size = 32 * 1024 * 1024; |
141 | 141 | ||
142 | void set_cmdline(char *cmd) | 142 | void set_cmdline(char *cmd) |
143 | { | 143 | { |
@@ -402,7 +402,7 @@ int linux_main(int argc, char **argv) | |||
402 | #ifndef CONFIG_HIGHMEM | 402 | #ifndef CONFIG_HIGHMEM |
403 | highmem = 0; | 403 | highmem = 0; |
404 | printf("CONFIG_HIGHMEM not enabled - physical memory shrunk " | 404 | printf("CONFIG_HIGHMEM not enabled - physical memory shrunk " |
405 | "to %ld bytes\n", physmem_size); | 405 | "to %lu bytes\n", physmem_size); |
406 | #endif | 406 | #endif |
407 | } | 407 | } |
408 | 408 | ||
@@ -414,8 +414,8 @@ int linux_main(int argc, char **argv) | |||
414 | 414 | ||
415 | setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem); | 415 | setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem); |
416 | if(init_maps(physmem_size, iomem_size, highmem)){ | 416 | if(init_maps(physmem_size, iomem_size, highmem)){ |
417 | printf("Failed to allocate mem_map for %ld bytes of physical " | 417 | printf("Failed to allocate mem_map for %lu bytes of physical " |
418 | "memory and %ld bytes of highmem\n", physmem_size, | 418 | "memory and %lu bytes of highmem\n", physmem_size, |
419 | highmem); | 419 | highmem); |
420 | exit(1); | 420 | exit(1); |
421 | } | 421 | } |
@@ -426,7 +426,7 @@ int linux_main(int argc, char **argv) | |||
426 | end_vm = start_vm + virtmem_size; | 426 | end_vm = start_vm + virtmem_size; |
427 | 427 | ||
428 | if(virtmem_size < physmem_size) | 428 | if(virtmem_size < physmem_size) |
429 | printf("Kernel virtual memory size shrunk to %ld bytes\n", | 429 | printf("Kernel virtual memory size shrunk to %lu bytes\n", |
430 | virtmem_size); | 430 | virtmem_size); |
431 | 431 | ||
432 | uml_postsetup(); | 432 | uml_postsetup(); |