diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-19 09:17:51 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-19 09:17:51 +0200 |
| commit | 9d45cc17d4a6cd3ffbca4dfa5a83a2cf027bed48 (patch) | |
| tree | 266ca7583f0a93fd7c49c1f43f9938ddf8f1c902 /init | |
| parent | dadc36e50d7d03ae26ba1f20b8a5aeef5ed1a030 (diff) | |
| parent | e5d14981deee34626f5d024f0a20980e6a2714c1 (diff) | |
| download | lwn-9d45cc17d4a6cd3ffbca4dfa5a83a2cf027bed48.tar.gz lwn-9d45cc17d4a6cd3ffbca4dfa5a83a2cf027bed48.zip | |
Merge branch 'rt/base' into rt/head
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 a04e1023e97d..3c656bae4da2 100644 --- a/init/main.c +++ b/init/main.c @@ -586,8 +586,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(); |