diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-08-09 23:20:49 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-08-09 23:20:49 +0200 |
| commit | 471417c9cfb4c2574e2c03bf2273fe12f5388a8e (patch) | |
| tree | ac026ba976bc253fc87a5cdec8f33d24d03e1c9c /arch/x86_64/kernel/setup.c | |
| parent | [SCSI] iscsi: fix 64 bit compile warning (diff) | |
| parent | [PATCH] i2o: remove new configuration API (diff) | |
| download | linux-471417c9cfb4c2574e2c03bf2273fe12f5388a8e.tar.xz linux-471417c9cfb4c2574e2c03bf2273fe12f5388a8e.zip | |
Merge ../linux-2.6
Diffstat (limited to 'arch/x86_64/kernel/setup.c')
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 0aa526298e92..116a491e2961 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c @@ -645,15 +645,15 @@ void __init setup_arch(char **cmdline_p) } } #endif - - sparse_init(); - #ifdef CONFIG_KEXEC if (crashk_res.start != crashk_res.end) { reserve_bootmem(crashk_res.start, crashk_res.end - crashk_res.start + 1); } #endif + + sparse_init(); + paging_init(); check_ioapic(); |