git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
[pandora-kernel.git]
/
arch
/
x86_64
/
kernel
/
setup.c
diff --git
a/arch/x86_64/kernel/setup.c
b/arch/x86_64/kernel/setup.c
index
0aa5262
..
116a491
100644
(file)
--- 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();