Commit 05b70ff6 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 7c79e1ee

arch/m68k/include/asm/sun3_pgtable.h

+3 −3
Original line number Diff line number Diff line
@@ -151,11 +151,11 @@ static inline void pgd_clear (pgd_t *pgdp) {} 




#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) \

	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) \

	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))





/*

arch/m68k/mm/sun3kmap.c

+3 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ static inline void do_page_mapin(unsigned long phys, unsigned long virt, 
	sun3_put_pte(virt, pte);



#ifdef SUN3_KMAP_DEBUG

	pr_info("mapin:");

	print_pte_vaddr(virt);

#endif
@@ -80,8 +81,8 @@ void __iomem *sun3_ioremap(unsigned long phys, unsigned long size, 
		return NULL;



#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



	pages = size / PAGE_SIZE;