x86: make mp_bus_id_to_type optional

[sfrench/cifs-2.6.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index c691f5f7fc27b40ea6b2df39e2fef9ac52b4cd0a..99ce94930b09302f7af89f75c07d7daa6a7ef668 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -232,30 +232,26 @@ EXPORT_SYMBOL(loops_per_jiffy);
 
 static int __init debug_kernel(char *str)
 {
-       if (*str)
-               return 0;
        console_loglevel = 10;
-       return 1;
+       return 0;
 }
 
 static int __init quiet_kernel(char *str)
 {
-       if (*str)
-               return 0;
        console_loglevel = 4;
-       return 1;
+       return 0;
 }
 
-__setup("debug", debug_kernel);
-__setup("quiet", quiet_kernel);
+early_param("debug", debug_kernel);
+early_param("quiet", quiet_kernel);
 
 static int __init loglevel(char *str)
 {
        get_option(&str, &console_loglevel);
-       return 1;
+       return 0;
 }
 
-__setup("loglevel=", loglevel);
+early_param("loglevel", loglevel);
 
 /*
  * Unknown boot options get handed to init, unless they look like
@@ -556,7 +552,6 @@ asmlinkage void __init start_kernel(void)
        preempt_disable();
        build_all_zonelists();
        page_alloc_init();
-       enable_debug_pagealloc();
        printk(KERN_NOTICE "Kernel command line: %s\n", boot_command_line);
        parse_early_param();
        parse_args("Booting kernel", static_command_line, __start___param,
@@ -612,6 +607,7 @@ asmlinkage void __init start_kernel(void)
        vfs_caches_init_early();
        cpuset_init_early();
        mem_init();
+       enable_debug_pagealloc();
        cpu_hotplug_init();
        kmem_cache_init();
        setup_per_cpu_pageset();
@@ -826,7 +822,6 @@ static int __init kernel_init(void * unused)
         */
        init_pid_ns.child_reaper = current;
 
-       __set_special_pids(1, 1);
        cad_pid = task_pid(current);
 
        smp_prepare_cpus(setup_max_cpus);