sh-fault-modernize-printing-of-kernel-messages.patch removed from -mm tree
The patch titled
Subject: sh: fault: modernize printing of kernel messages
has been removed from the -mm tree. Its filename was
sh-fault-modernize-printing-of-kernel-messages.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Geert Uytterhoeven <[email protected]>
Subject: sh: fault: modernize printing of kernel messages
- Convert from printk() to pr_*(),
- Add missing continuations,
- Use "%llx" to format u64,
- Join multiple prints in show_fault_oops() into a single print.
Signed-off-by Geert Uytterhoeven <[email protected]>
Signed-off-by Mike Rapoport <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Brian Cain <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Christophe Leroy <[email protected]>
Cc Fenghua Yu <[email protected]>
Cc Guan Xuetao <[email protected]>
Cc James Morse <[email protected]>
Cc Jonas Bonn <[email protected]>
Cc Julien Thierry <[email protected]>
Cc Ley Foon Tan <[email protected]>
Cc Marc Zyngier <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Rich Felker <[email protected]>
Cc Russell King <[email protected]>
Cc Stafford Horne <[email protected]>
Cc Stefan Kristiansson <[email protected]>
Cc Suzuki K Poulose <[email protected]>
Cc Tony Luck <[email protected]>
Cc Will Deacon <[email protected]>
Cc Yoshinori Sato <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/sh/mm/fault.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-)
arch/sh/mm/fault.c renamed from arch/sh/mm/fault.c~sh-fault-modernize-printing-of-kernel-messages +13 -18
@@ -47,10 +47,10 @@ static void show_pte(struct mm_struct *m pgd = swapper_pg_dir; } -printk (KERN_ALERT "pgd = %p\n" , pgd); +pr_alert ("pgd = %p\n" , pgd); pgd +=pgd_index (addr); -printk (KERN_ALERT "[%08lx] *pgd=%0*Lx" , addr, - (u32)(sizeof (*pgd) *2 ), (u64 )pgd_val (*pgd)); +pr_alert ("[%08lx] *pgd=%0*llx" , addr, (u32)(sizeof (*pgd) *2 ), + (u64 )pgd_val (*pgd)); do { pud_t *pud;
@@ -61,33 +61,33 @@ static void show_pte(struct mm_struct *mbreak ;if (pgd_bad (*pgd)) { -printk ("(bad)" ); +pr_cont ("(bad)" );break ; } pud =pud_offset (pgd, addr);if (PTRS_PER_PUD !=1 ) -printk (", *pud=%0*Lx" , (u32)(sizeof (*pud) *2 ), - (u64 )pud_val (*pud)); +pr_cont (", *pud=%0*llx" , (u32)(sizeof (*pud) *2 ), + (u64 )pud_val (*pud));if (pud_none (*pud))break ;if (pud_bad (*pud)) { -printk ("(bad)" ); +pr_cont ("(bad)" );break ; } pmd =pmd_offset (pud, addr);if (PTRS_PER_PMD !=1 ) -printk (", *pmd=%0*Lx" , (u32)(sizeof (*pmd) *2 ), - (u64 )pmd_val (*pmd)); +pr_cont (", *pmd=%0*llx" , (u32)(sizeof (*pmd) *2 ), + (u64 )pmd_val (*pmd));if (pmd_none (*pmd))break ;if (pmd_bad (*pmd)) { -printk ("(bad)" ); +pr_cont ("(bad)" );break ; }
@@ -96,11 +96,11 @@ static void show_pte(struct mm_struct *mbreak ; pte =pte_offset_kernel (pmd, addr); -printk (", *pte=%0*Lx" , (u32)(sizeof (*pte) *2 ), - (u64 )pte_val (*pte)); +pr_cont (", *pte=%0*llx" , (u32)(sizeof (*pte) *2 ), + (u64 )pte_val (*pte)); }while (0 ); -printk ("\n" ); +pr_cont ("\n" ); }static inline pmd_t *vmalloc_sync_one (pgd_t *pgd,unsigned long address)
@@ -188,14 +188,12 @@ show_fault_oops(struct pt_regs *regs, unif (!oops_may_print ())return ; -printk (KERN_ALERT "BUG: unable to handle kernel " ); -if (address <PAGE_SIZE ) -printk (KERN_CONT "NULL pointer dereference" ); -else -printk (KERN_CONT "paging request" );