m68k/mm: Modernize printing of kernel messages

geertu · geertu · commit e6991137a389 · 2017-02-12T10:36:53.000+01:00
Convert from printk() to pr_*().

Signed-off-by: Geert Uytterhoeven &lt;geert@linux-m68k.org&gt;
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
@@ -66,7 +66,7 @@ void __init m68k_setup_node(int node)
 	end = (unsigned long)phys_to_virt(info->addr + info->size - 1) >> __virt_to_node_shift();
 	for (; i <= end; i++) {
 		if (pg_data_table[i])
-			printk("overlap at %u for chunk %u\n", i, node);
+			pr_warn("overlap at %u for chunk %u\n", i, node);
 		pg_data_table[i] = pg_data_map + node;
 	}
 #endif
diff --git a/arch/m68k/mm/memory.c b/arch/m68k/mm/memory.c
@@ -47,9 +47,7 @@ void __init init_pointer_table(unsigned long ptable)
 	}
 
 	PD_MARKBITS(dp) &= ~mask;
-#ifdef DEBUG
-	printk("init_pointer_table: %lx, %x\n", ptable, PD_MARKBITS(dp));
-#endif
+	pr_debug("init_pointer_table: %lx, %x\n", ptable, PD_MARKBITS(dp));
 
 	/* unreserve the page so it's possible to free that page */
 	PD_PAGE(dp)->flags &= ~(1 << PG_reserved);

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ void __init m68k_setup_node(int node)`
`66`	`66`	`end = (unsigned long)phys_to_virt(info->addr + info->size - 1) >> __virt_to_node_shift();`
`67`	`67`	`for (; i <= end; i++) {`
`68`	`68`	`if (pg_data_table[i])`
`69`		`- printk("overlap at %u for chunk %u\n", i, node);`
	`69`	`+ pr_warn("overlap at %u for chunk %u\n", i, node);`
`70`	`70`	`pg_data_table[i] = pg_data_map + node;`
`71`	`71`	`}`
`72`	`72`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,7 @@ void __init init_pointer_table(unsigned long ptable)`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`PD_MARKBITS(dp) &= ~mask;`
`50`		`-#ifdef DEBUG`
`51`		`- printk("init_pointer_table: %lx, %x\n", ptable, PD_MARKBITS(dp));`
`52`		`-#endif`
	`50`	`+ pr_debug("init_pointer_table: %lx, %x\n", ptable, PD_MARKBITS(dp));`
`53`	`51`
`54`	`52`	`/* unreserve the page so it's possible to free that page */`
`55`	`53`	`PD_PAGE(dp)->flags &= ~(1 << PG_reserved);`