1 files changed, 15 insertions, 1 deletions

diff --git a/init/main.c b/init/main.c
index dac44a9356a5..05b5283e98fa 100644
--- a/init/main.c
+++ b/init/main.c
@@ -149,6 +149,20 @@ static int __init nosmp(char *str)
 
 early_param("nosmp", nosmp);
 
+/* this is hard limit */
+static int __init nrcpus(char *str)
+{
+        int nr_cpus;
+
+        get_option(&str, &nr_cpus);
+        if (nr_cpus > 0 && nr_cpus < nr_cpu_ids)
+                nr_cpu_ids = nr_cpus;
+
+        return 0;
+}
+
+early_param("nr_cpus", nrcpus);
+
 static int __init maxcpus(char *str)
 {
         get_option(&str, &setup_max_cpus);
@@ -584,6 +598,7 @@ asmlinkage void __init start_kernel(void)
                 local_irq_disable();
         }
         rcu_init();
+        radix_tree_init();
         /* init some links before init_ISA_irqs() */
         early_irq_init();
         init_IRQ();
@@ -659,7 +674,6 @@ asmlinkage void __init start_kernel(void)
         key_init();
         security_init();
         vfs_caches_init(totalram_pages);
-        radix_tree_init();
         signals_init();
         /* rootfs populating might need page-writeback */
         page_writeback_init();