Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0b914ae authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/include: Modernize printing of kernel messages 



  - Convert from printk() to pr_*(),
  - Add dummies for validating format strings when debugging is
    disabled.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent e6991137

arch/m68k/include/asm/bug.h

+2 −2
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ 
#ifdef CONFIG_DEBUG_BUGVERBOSE

#ifndef CONFIG_SUN3

#define BUG() do { \

	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \

	pr_crit("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \

	__builtin_trap(); \

} while (0)

#else

#define BUG() do { \

	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \

	pr_crit("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \

	panic("BUG!"); \

} while (0)

#endif

arch/m68k/include/asm/floppy.h

+3 −3
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id) 
		virtual_dma_residue += virtual_dma_count;

		virtual_dma_count=0;

#ifdef TRACE_FLPY_INT

		printk("count=%x, residue=%x calls=%d bytes=%d dma_wait=%d\n",

		pr_info("count=%x, residue=%x calls=%d bytes=%d dma_wait=%d\n",

			virtual_dma_count, virtual_dma_residue, calls, bytes,

			dma_wait);

		calls = 0;

arch/m68k/include/asm/math-emu.h

+5 −5
Original line number Diff line number Diff line
@@ -105,21 +105,21 @@ struct fp_data { 
#ifdef FPU_EMU_DEBUG

extern unsigned int fp_debugprint;



#define dprint(bit, fmt, args...) ({			\

#define dprint(bit, fmt, ...) ({			\

	if (fp_debugprint & (1 << (bit)))		\

		printk(fmt, ## args);			\

		pr_info(fmt, ##__VA_ARGS__);		\

})

#else

#define dprint(bit, fmt, args...)

#define dprint(bit, fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif



#define uprint(str) ({					\

	static int __count = 3;				\

							\

	if (__count > 0) {				\

		printk("You just hit an unimplemented "	\

		pr_err("You just hit an unimplemented "	\

		       "fpu instruction (%s)\n", str);	\

		printk("Please report this to ....\n");	\

		pr_err("Please report this to ....\n");	\

		__count--;				\

	}						\

})