Browse Source

m68k/mm: sun3 - Modernize printing of kernel messages

  - Convert from printk() to pr_*(),
  - Add missing print to do_page_mapin(), as print_pte_vaddr() calls
    pr_cont().

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Geert Uytterhoeven 8 years ago
parent
commit
05b70ff69c
2 changed files with 6 additions and 5 deletions
  1. 3 3
      arch/m68k/include/asm/sun3_pgtable.h
  2. 3 2
      arch/m68k/mm/sun3kmap.c

+ 3 - 3
arch/m68k/include/asm/sun3_pgtable.h

@@ -151,11 +151,11 @@ static inline void pgd_clear (pgd_t *pgdp) {}
 
 
 
 
 #define pte_ERROR(e) \
 #define pte_ERROR(e) \
-	printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
+	pr_err("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
 #define pmd_ERROR(e) \
 #define pmd_ERROR(e) \
-	printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))
+	pr_err("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))
 #define pgd_ERROR(e) \
 #define pgd_ERROR(e) \
-	printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
+	pr_err("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
 
 
 
 
 /*
 /*

+ 3 - 2
arch/m68k/mm/sun3kmap.c

@@ -40,6 +40,7 @@ static inline void do_page_mapin(unsigned long phys, unsigned long virt,
 	sun3_put_pte(virt, pte);
 	sun3_put_pte(virt, pte);
 
 
 #ifdef SUN3_KMAP_DEBUG
 #ifdef SUN3_KMAP_DEBUG
+	pr_info("mapin:");
 	print_pte_vaddr(virt);
 	print_pte_vaddr(virt);
 #endif
 #endif
 
 
@@ -80,8 +81,8 @@ void __iomem *sun3_ioremap(unsigned long phys, unsigned long size,
 		return NULL;
 		return NULL;
 
 
 #ifdef SUN3_KMAP_DEBUG
 #ifdef SUN3_KMAP_DEBUG
-	printk("ioremap: got virt %p size %lx(%lx)\n",
-	       area->addr, size, area->size);
+	pr_info("ioremap: got virt %p size %lx(%lx)\n", area->addr, size,
+		area->size);
 #endif
 #endif
 
 
 	pages = size / PAGE_SIZE;
 	pages = size / PAGE_SIZE;