Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 64566
b: refs/heads/master
c: 62e6f1e
h: refs/heads/master
v: v3
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed Aug 31, 2007
1 parent 28011bc commit 4db7e0b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a1c582d0720f2eff61043e90711767decf37b917
refs/heads/master: 62e6f1e8bb7c48c02b8bdb3085c5f6365682149b
8 changes: 0 additions & 8 deletions trunk/init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -397,10 +397,6 @@ static void __init smp_init(void)
{
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)
Expand Down Expand Up @@ -545,10 +541,6 @@ asmlinkage void __init start_kernel(void)
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 */

Expand Down

0 comments on commit 4db7e0b

Please sign in to comment.