diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-19 09:07:53 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-19 09:07:53 +0200 |
| commit | e5d14981deee34626f5d024f0a20980e6a2714c1 (patch) | |
| tree | 47617bc28c807b08b853326a250137c419b8b411 /init | |
| parent | a1d0e61c346d3306d52fa88c463bdfa86cb5eb62 (diff) | |
| parent | c124891f50f11e33acdfa276864ea089bab726b6 (diff) | |
| download | lwn-e5d14981deee34626f5d024f0a20980e6a2714c1.tar.gz lwn-e5d14981deee34626f5d024f0a20980e6a2714c1.zip | |
Merge branch 'linus' into rt/base
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 252f448d8b9d..a6075cbb4be0 100644 --- a/init/main.c +++ b/init/main.c @@ -583,8 +583,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(); |