git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Add adm8211 802.11b wireless driver
[pandora-kernel.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index
cc0653e
..
9def935
100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-168,7
+168,7
@@
static int __init maxcpus(char *str)
return 0;
}
return 0;
}
-early_param("maxcpus
=
", maxcpus);
+early_param("maxcpus", maxcpus);
#else
#define max_cpus NR_CPUS
#endif
#else
#define max_cpus NR_CPUS
#endif
@@
-397,10
+397,6
@@
static void __init smp_init(void)
{
unsigned int cpu;
{
unsigned int cpu;
-#ifndef CONFIG_HOTPLUG_CPU
- cpu_possible_map = cpu_present_map;
-#endif
-
/* FIXME: This should be done in userspace --RR */
for_each_present_cpu(cpu) {
if (num_online_cpus() >= max_cpus)
/* FIXME: This should be done in userspace --RR */
for_each_present_cpu(cpu) {
if (num_online_cpus() >= max_cpus)
@@
-545,10
+541,6
@@
asmlinkage void __init start_kernel(void)
setup_arch(&command_line);
setup_command_line(command_line);
unwind_setup();
setup_arch(&command_line);
setup_command_line(command_line);
unwind_setup();
-#ifndef CONFIG_HOTPLUG_CPU
- if (max_cpus < 2)
- cpu_possible_map = cpu_online_map;
-#endif
setup_per_cpu_areas();
smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
setup_per_cpu_areas();
smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */