diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-07-21 23:16:41 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-07-21 23:16:41 -0400 |
| commit | 4b575f3e8aba07688fc48025efde41036e5d5eee (patch) | |
| tree | 4bbccce83e80af179500be45f9e8080315f5e32e /arch/powerpc/kernel/setup_32.c | |
| parent | f7723f0eaf53d51ee54374116b25ac33e0be8542 (diff) | |
| parent | a8e616b9a41212655042f59c969f30bb7de1ec73 (diff) | |
Merge remote-tracking branch 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/kernel/setup_32.c')
| -rw-r--r-- | arch/powerpc/kernel/setup_32.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 3dffce673c1f..209135af0a40 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c | |||
| @@ -127,6 +127,8 @@ notrace void __init machine_init(unsigned long dt_ptr) | |||
| 127 | /* Do some early initialization based on the flat device tree */ | 127 | /* Do some early initialization based on the flat device tree */ |
| 128 | early_init_devtree(__va(dt_ptr)); | 128 | early_init_devtree(__va(dt_ptr)); |
| 129 | 129 | ||
| 130 | early_init_mmu(); | ||
| 131 | |||
| 130 | probe_machine(); | 132 | probe_machine(); |
| 131 | 133 | ||
| 132 | setup_kdump_trampoline(); | 134 | setup_kdump_trampoline(); |