powerpc/mmu: Add userspace-to-physical addresses translation cache

[karo-tx-linux.git] / arch / powerpc / kernel / setup_64.c

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index c69671c03c3b5b7dc9b3e1f70726abba12c5c4b1..bdcbb716f4d66845e56b619e958e85c3bde318fd 100644 (file)
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -523,7 +523,8 @@ void __init setup_system(void)
        smp_release_cpus();
 #endif
 
-       pr_info("Starting Linux PPC64 %s\n", init_utsname()->version);
+       pr_info("Starting Linux %s %s\n", init_utsname()->machine,
+                init_utsname()->version);
 
        pr_info("-----------------------------------------------------\n");
        pr_info("ppc64_pft_size    = 0x%llx\n", ppc64_pft_size);
@@ -685,6 +686,9 @@ void __init setup_arch(char **cmdline_p)
        init_mm.brk = klimit;
 #ifdef CONFIG_PPC_64K_PAGES
        init_mm.context.pte_frag = NULL;
+#endif
+#ifdef CONFIG_SPAPR_TCE_IOMMU
+       mm_iommu_init(&init_mm.context);
 #endif
        irqstack_early_init();
        exc_lvl_early_init();