linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / um / kernel / um_arch.c

diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index b9a8f42..27cdf91 100644 (file)
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -3,6 +3,7 @@
  * Licensed under the GPL
  */
 
+#include "linux/config.h"
 #include "linux/kernel.h"
 #include "linux/sched.h"
 #include "linux/notifier.h"
@@ -329,8 +330,6 @@ EXPORT_SYMBOL(end_iomem);
 
 #define MIN_VMALLOC (32 * 1024 * 1024)
 
-extern char __binary_start;
-
 int linux_main(int argc, char **argv)
 {
        unsigned long avail, diff;
@@ -375,9 +374,8 @@ int linux_main(int argc, char **argv)
 
        printf("UML running in %s mode\n", mode);
 
-       uml_start = (unsigned long) &__binary_start;
-       host_task_size = CHOOSE_MODE_PROC(set_task_sizes_tt,
-                                         set_task_sizes_skas, &task_size);
+       uml_start = CHOOSE_MODE_PROC(set_task_sizes_tt, set_task_sizes_skas, 0,
+                                    &host_task_size, &task_size);
 
        /*
         * Setting up handlers to 'sig_info' struct
@@ -397,7 +395,7 @@ int linux_main(int argc, char **argv)
                physmem_size += UML_ROUND_UP(brk_start) - UML_ROUND_UP(&_end);
        }
 
-       uml_physmem = uml_start & PAGE_MASK;
+       uml_physmem = uml_start;
 
        /* Reserve up to 4M after the current brk */
        uml_reserved = ROUND_4M(brk_start) + (1 << 22);
@@ -423,7 +421,7 @@ int linux_main(int argc, char **argv)
 #ifndef CONFIG_HIGHMEM
                highmem = 0;
                printf("CONFIG_HIGHMEM not enabled - physical memory shrunk "
-                      "to %Lu bytes\n", physmem_size);
+                      "to %lu bytes\n", physmem_size);
 #endif
        }
 
@@ -435,8 +433,8 @@ int linux_main(int argc, char **argv)
 
        setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem);
        if(init_maps(physmem_size, iomem_size, highmem)){
-               printf("Failed to allocate mem_map for %Lu bytes of physical "
-                      "memory and %Lu bytes of highmem\n", physmem_size,
+               printf("Failed to allocate mem_map for %lu bytes of physical "
+                      "memory and %lu bytes of highmem\n", physmem_size,
                       highmem);
                exit(1);
        }
@@ -479,8 +477,7 @@ static struct notifier_block panic_exit_notifier = {
 
 void __init setup_arch(char **cmdline_p)
 {
-       atomic_notifier_chain_register(&panic_notifier_list,
-                       &panic_exit_notifier);
+       notifier_chain_register(&panic_notifier_list, &panic_exit_notifier);
        paging_init();
         strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
        *cmdline_p = command_line;
@@ -490,21 +487,10 @@ void __init setup_arch(char **cmdline_p)
 void __init check_bugs(void)
 {
        arch_check_bugs();
-       os_check_bugs();
+       check_sigio();
+       check_devanon();
 }
 
-void apply_alternatives(struct alt_instr *start, struct alt_instr *end)
-{
-}
-
-#ifdef CONFIG_SMP
-void alternatives_smp_module_add(struct module *mod, char *name,
-                                void *locks, void *locks_end,
-                                void *text,  void *text_end)
+void apply_alternatives(void *start, void *end)
 {
 }
-
-void alternatives_smp_module_del(struct module *mod)
-{
-}
-#endif