Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-drm-fsl-dcu.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 633442f79e9020c1e057858420d212d7f7e3ae08..a42fdf4aeba91ada21882d86d552ed722c00eb5a 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -125,7 +125,9 @@ static char *ramdisk_execute_command;
 
 #ifdef CONFIG_SMP
 /* Setup configured maximum number of CPUs to activate */
-unsigned int __initdata setup_max_cpus = NR_CPUS;
+unsigned int setup_max_cpus = NR_CPUS;
+EXPORT_SYMBOL(setup_max_cpus);
+
 
 /*
  * Setup routine for controlling SMP activation
@@ -431,7 +433,7 @@ static noinline void __init_refok rest_init(void)
 
        rcu_scheduler_starting();
        /*
-        * We need to spawn init first so that it obtains pid-1, however
+        * We need to spawn init first so that it obtains pid 1, however
         * the init task will end up wanting to create kthreads, which, if
         * we schedule it before we create kthreadd, will OOPS.
         */