Merge branch 'linus' into perf/core

Reason: Further changes conflict with upstream fixes Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2010-06-28 22:33:13 +02:00
parent 9a15a07fe2 5904b3b81d
commit f384c954c9
268 changed files with 2056 additions and 1694 deletions
--- a/init/main.c
+++ b/init/main.c
@@ -123,7 +123,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