* [PATCH] Add KERN_* prefix to printks in bug.h
@ 2007-07-16 0:36 Diego Woitasen
2007-07-16 4:45 ` Alexey Dobriyan
0 siblings, 1 reply; 3+ messages in thread
From: Diego Woitasen @ 2007-07-16 0:36 UTC (permalink / raw)
To: linux-kernel; +Cc: Diego Woitasen
---
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;
#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
--
1.5.2.3
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Add KERN_* prefix to printks in bug.h
2007-07-16 0:36 [PATCH] Add KERN_* prefix to printks in bug.h Diego Woitasen
@ 2007-07-16 4:45 ` Alexey Dobriyan
2007-07-16 12:45 ` Diego Woitasen
0 siblings, 1 reply; 3+ messages in thread
From: Alexey Dobriyan @ 2007-07-16 4:45 UTC (permalink / raw)
To: Diego Woitasen; +Cc: linux-kernel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Add KERN_* prefix to printks in bug.h
2007-07-16 4:45 ` Alexey Dobriyan
@ 2007-07-16 12:45 ` Diego Woitasen
0 siblings, 0 replies; 3+ messages in thread
From: Diego Woitasen @ 2007-07-16 12:45 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: Diego Woitasen, linux-kernel
On Mon, Jul 16, 2007 at 08:45:47AM +0400, Alexey Dobriyan wrote:
> 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
yes, sorry... the "unrelated" changes are result of Lindent. May be I
should include that in the git log.
--
--------------
Diego Woitasen
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-07-22 5:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-07-16 0:36 [PATCH] Add KERN_* prefix to printks in bug.h Diego Woitasen
2007-07-16 4:45 ` Alexey Dobriyan
2007-07-16 12:45 ` Diego Woitasen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®