Commit f0b914ae authored by Geert Uytterhoeven's avatar Geert Uytterhoeven

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
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
#ifdef CONFIG_DEBUG_BUGVERBOSE #ifdef CONFIG_DEBUG_BUGVERBOSE
#ifndef CONFIG_SUN3 #ifndef CONFIG_SUN3
#define BUG() do { \ #define BUG() do { \
printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ pr_crit("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
__builtin_trap(); \ __builtin_trap(); \
} while (0) } while (0)
#else #else
#define BUG() do { \ #define BUG() do { \
printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ pr_crit("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
panic("BUG!"); \ panic("BUG!"); \
} while (0) } while (0)
#endif #endif
......
...@@ -234,7 +234,7 @@ asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id) ...@@ -234,7 +234,7 @@ asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id)
virtual_dma_residue += virtual_dma_count; virtual_dma_residue += virtual_dma_count;
virtual_dma_count=0; virtual_dma_count=0;
#ifdef TRACE_FLPY_INT #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, virtual_dma_count, virtual_dma_residue, calls, bytes,
dma_wait); dma_wait);
calls = 0; calls = 0;
......
...@@ -105,21 +105,21 @@ struct fp_data { ...@@ -105,21 +105,21 @@ struct fp_data {
#ifdef FPU_EMU_DEBUG #ifdef FPU_EMU_DEBUG
extern unsigned int fp_debugprint; extern unsigned int fp_debugprint;
#define dprint(bit, fmt, args...) ({ \ #define dprint(bit, fmt, ...) ({ \
if (fp_debugprint & (1 << (bit))) \ if (fp_debugprint & (1 << (bit))) \
printk(fmt, ## args); \ pr_info(fmt, ##__VA_ARGS__); \
}) })
#else #else
#define dprint(bit, fmt, args...) #define dprint(bit, fmt, ...) no_printk(fmt, ##__VA_ARGS__)
#endif #endif
#define uprint(str) ({ \ #define uprint(str) ({ \
static int __count = 3; \ static int __count = 3; \
\ \
if (__count > 0) { \ if (__count > 0) { \
printk("You just hit an unimplemented " \ pr_err("You just hit an unimplemented " \
"fpu instruction (%s)\n", str); \ "fpu instruction (%s)\n", str); \
printk("Please report this to ....\n"); \ pr_err("Please report this to ....\n"); \
__count--; \ __count--; \
} \ } \
}) })
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment