diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-06-28 16:33:13 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-06-28 16:33:24 -0400 |
| commit | f384c954c9fe3d3c6fce5ae66b67f2ddd947d098 (patch) | |
| tree | a38541b8083a2304435e9a153d408bd7cd44116e /init | |
| parent | 9a15a07fe2175dc25cd928a354b3839f562ac8cc (diff) | |
| parent | 5904b3b81d25166e5e39b9727645bb47937618e3 (diff) | |
Merge branch 'linus' into perf/core
Reason: Further changes conflict with upstream fixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index e2a2bf3a169..e407a05adc2 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -123,7 +123,9 @@ static char *ramdisk_execute_command; | |||
| 123 | 123 | ||
| 124 | #ifdef CONFIG_SMP | 124 | #ifdef CONFIG_SMP |
| 125 | /* Setup configured maximum number of CPUs to activate */ | 125 | /* Setup configured maximum number of CPUs to activate */ |
| 126 | unsigned int __initdata setup_max_cpus = NR_CPUS; | 126 | unsigned int setup_max_cpus = NR_CPUS; |
| 127 | EXPORT_SYMBOL(setup_max_cpus); | ||
| 128 | |||
| 127 | 129 | ||
| 128 | /* | 130 | /* |
| 129 | * Setup routine for controlling SMP activation | 131 | * Setup routine for controlling SMP activation |