skge: use unique IRQ name

[~andy/linux] / init / main.c

diff --git a/init/main.c b/init/main.c
index 63904bb6ae37bf30b1e0b59fc266af7a080491cf..7449819a4805b14dd3c68d7300cc54ce5d4b8044 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -18,7 +18,6 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>
-#include <linux/utsname.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>
@@ -68,6 +67,8 @@
 #include <linux/async.h>
 #include <linux/kmemcheck.h>
 #include <linux/kmemtrace.h>
+#include <linux/sfi.h>
+#include <linux/shmem_fs.h>
 #include <trace/boot.h>
 
 #include <asm/io.h>
@@ -358,11 +359,6 @@ static inline void smp_prepare_cpus(unsigned int maxcpus) { }
 
 #else
 
-#if NR_CPUS > BITS_PER_LONG
-cpumask_t cpu_mask_all __read_mostly = CPU_MASK_ALL;
-EXPORT_SYMBOL(cpu_mask_all);
-#endif
-
 /* Setup number of possible processor ids */
 int nr_cpu_ids __read_mostly = NR_CPUS;
 EXPORT_SYMBOL(nr_cpu_ids);
@@ -667,12 +663,12 @@ asmlinkage void __init start_kernel(void)
 #endif
        thread_info_cache_init();
        cred_init();
-       fork_init(num_physpages);
+       fork_init(totalram_pages);
        proc_caches_init();
        buffer_init();
        key_init();
        security_init();
-       vfs_caches_init(num_physpages);
+       vfs_caches_init(totalram_pages);
        radix_tree_init();
        signals_init();
        /* rootfs populating might need page-writeback */
@@ -688,6 +684,7 @@ asmlinkage void __init start_kernel(void)
        check_bugs();
 
        acpi_early_init(); /* before LAPIC and SMP init */
+       sfi_init_late();
 
        ftrace_init();
 
@@ -785,6 +782,7 @@ static void __init do_basic_setup(void)
        init_workqueues();
        cpuset_init_smp();
        usermodehelper_init();
+       init_tmpfs();
        driver_init();
        init_irq_proc();
        do_ctors();