diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-19 23:23:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-19 23:23:01 +0200 |
| commit | 2788a103bb4ae1ea0f1800155c52337d644c5f7d (patch) | |
| tree | eaa86994bfd0962bf8a034f63e7f3608e82c136f /init | |
| parent | a748b90bdf97ef6d544b6541ba39e5ce29e5be11 (diff) | |
| parent | 6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f (diff) | |
Merge branch 'linus' into auto-latest
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 2c5ade79eb81..2d9d6bdfe7c9 100644 --- a/init/main.c +++ b/init/main.c @@ -584,8 +584,8 @@ asmlinkage void __init start_kernel(void) setup_arch(&command_line); mm_init_owner(&init_mm, &init_task); setup_command_line(command_line); - setup_per_cpu_areas(); setup_nr_cpu_ids(); + setup_per_cpu_areas(); smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ build_all_zonelists(); |