diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /init/main.c | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index ee123243fb53..36f608a7cfba 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -503,6 +503,7 @@ asmlinkage void __init start_kernel(void) | |||
| 503 | printk(KERN_NOTICE); | 503 | printk(KERN_NOTICE); |
| 504 | printk(linux_banner); | 504 | printk(linux_banner); |
| 505 | setup_arch(&command_line); | 505 | setup_arch(&command_line); |
| 506 | unwind_setup(); | ||
| 506 | setup_per_cpu_areas(); | 507 | setup_per_cpu_areas(); |
| 507 | smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ | 508 | smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ |
| 508 | 509 | ||