Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

[linux-2.6-microblaze.git] / arch / powerpc / kernel / setup-common.c

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 26328fd..aa9c2d0 100644 (file)
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -926,10 +926,7 @@ void __init setup_arch(char **cmdline_p)
 
        klp_init_thread_info(&init_task);
 
-       init_mm.start_code = (unsigned long)_stext;
-       init_mm.end_code = (unsigned long) _etext;
-       init_mm.end_data = (unsigned long) _edata;
-       init_mm.brk = (unsigned long)_end;
+       setup_initial_init_mm(_stext, _etext, _edata, _end);
 
        mm_iommu_init(&init_mm);
        irqstack_early_init();