Messages in this thread | | | Date | Mon, 16 Jul 2007 08:45:47 +0400 | From | Alexey Dobriyan <> | Subject | Re: [PATCH] Add KERN_* prefix to printks in bug.h |
| |
On Sun, Jul 15, 2007 at 09:36:59PM -0300, Diego Woitasen wrote: > --- > include/asm-generic/bug.h | 25 +++++++++++++------------ > 1 files changed, 13 insertions(+), 12 deletions(-) > > diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h > index 7f30cce..6e49266 100644 > --- a/include/asm-generic/bug.h > +++ b/include/asm-generic/bug.h > @@ -8,22 +8,23 @@ > #ifdef CONFIG_GENERIC_BUG > #ifndef __ASSEMBLY__ > struct bug_entry { > - unsigned long bug_addr; > + unsigned long bug_addr;
Never include unrelated changes.
> #ifdef CONFIG_DEBUG_BUGVERBOSE > - const char *file; > - unsigned short line; > + const char *file; > + unsigned short line; > #endif > - unsigned short flags; > + unsigned short flags; > }; > -#endif /* __ASSEMBLY__ */ > +#endif /* __ASSEMBLY__ */ > > #define BUGFLAG_WARNING (1<<0) > -#endif /* CONFIG_GENERIC_BUG */ > +#endif /* CONFIG_GENERIC_BUG */ > > #ifndef HAVE_ARCH_BUG > -#define BUG() do { \ > - printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \ > - panic("BUG!"); \ > +#define BUG() do { \ > + printk(KERN_EMERG "BUG: failure at %s:%d/%s()!\n", \ > + __FILE__, __LINE__, __FUNCTION__); \ > + panic("BUG!"); \ > } while (0) > #endif > > @@ -35,15 +36,15 @@ struct bug_entry { > #define WARN_ON(condition) ({ \ > typeof(condition) __ret_warn_on = (condition); \ > if (unlikely(__ret_warn_on)) { \ > - printk("WARNING: at %s:%d %s()\n", __FILE__, \ > - __LINE__, __FUNCTION__); \ > + printk(KERN_WARNING "WARNING: at %s:%d %s()\n", \ > + __FILE__, __LINE__, __FUNCTION__); \ > dump_stack(); \ > } \ > unlikely(__ret_warn_on); \ > }) > #endif > > -#else /* !CONFIG_BUG */ > +#else /* !CONFIG_BUG */ > #ifndef HAVE_ARCH_BUG > #define BUG() > #endif
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |