1 files changed, 9 insertions, 8 deletions

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 380e02941691..c7809f41d9d1 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -88,21 +88,21 @@ void show_pte(struct mm_struct *mm, unsigned long addr)
                         break;
 
                 pud = pud_offset(pgd, addr);
-                printk(", *pud=%016llx", pud_val(*pud));
+                pr_cont(", *pud=%016llx", pud_val(*pud));
                 if (pud_none(*pud) || pud_bad(*pud))
                         break;
 
                 pmd = pmd_offset(pud, addr);
-                printk(", *pmd=%016llx", pmd_val(*pmd));
+                pr_cont(", *pmd=%016llx", pmd_val(*pmd));
                 if (pmd_none(*pmd) || pmd_bad(*pmd))
                         break;
 
                 pte = pte_offset_map(pmd, addr);
-                printk(", *pte=%016llx", pte_val(*pte));
+                pr_cont(", *pte=%016llx", pte_val(*pte));
                 pte_unmap(pte);
         } while(0);
 
-        printk("\n");
+        pr_cont("\n");
 }
 
 #ifdef CONFIG_ARM64_HW_AFDBM
@@ -510,10 +510,10 @@ static const struct fault_info {
         { do_bad,               SIGBUS,  0,             "unknown 17"                    },
         { do_bad,               SIGBUS,  0,             "unknown 18"                    },
         { do_bad,               SIGBUS,  0,             "unknown 19"                    },
-        { do_bad,               SIGBUS,  0,             "synchronous external abort (translation table walk)" },
-        { do_bad,               SIGBUS,  0,             "synchronous external abort (translation table walk)" },
-        { do_bad,               SIGBUS,  0,             "synchronous external abort (translation table walk)" },
-        { do_bad,               SIGBUS,  0,             "synchronous external abort (translation table walk)" },
+        { do_bad,               SIGBUS,  0,             "synchronous abort (translation table walk)" },
+        { do_bad,               SIGBUS,  0,             "synchronous abort (translation table walk)" },
+        { do_bad,               SIGBUS,  0,             "synchronous abort (translation table walk)" },
+        { do_bad,               SIGBUS,  0,             "synchronous abort (translation table walk)" },
         { do_bad,               SIGBUS,  0,             "synchronous parity error"      },
         { do_bad,               SIGBUS,  0,             "unknown 25"                    },
         { do_bad,               SIGBUS,  0,             "unknown 26"                    },
@@ -686,5 +686,6 @@ int cpu_enable_pan(void *__unused)
 int cpu_enable_uao(void *__unused)
 {
         asm(SET_PSTATE_UAO(1));
+        return 0;
 }
 #endif /* CONFIG_ARM64_UAO */