Skip to content

Commit 05b70ff

Browse files
committed
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 <[email protected]>
1 parent 7c79e1e commit 05b70ff

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

arch/m68k/include/asm/sun3_pgtable.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ static inline void pgd_clear (pgd_t *pgdp) {}
151151

152152

153153
#define pte_ERROR(e) \
154-
printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
154+
pr_err("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
155155
#define pmd_ERROR(e) \
156-
printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))
156+
pr_err("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))
157157
#define pgd_ERROR(e) \
158-
printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
158+
pr_err("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
159159

160160

161161
/*

arch/m68k/mm/sun3kmap.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ static inline void do_page_mapin(unsigned long phys, unsigned long virt,
4040
sun3_put_pte(virt, pte);
4141

4242
#ifdef SUN3_KMAP_DEBUG
43+
pr_info("mapin:");
4344
print_pte_vaddr(virt);
4445
#endif
4546

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

8283
#ifdef SUN3_KMAP_DEBUG
83-
printk("ioremap: got virt %p size %lx(%lx)\n",
84-
area->addr, size, area->size);
84+
pr_info("ioremap: got virt %p size %lx(%lx)\n", area->addr, size,
85+
area->size);
8586
#endif
8687

8788
pages = size / PAGE_SIZE;

0 commit comments

Comments
 (0)