printk: create pr_<level> functions

[deliverable/linux.git] / kernel / printk / printk.c

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 09af62e71fee0ae44c073d260d49044a2f6f62c8..d2accf2f4448c615bc5924e1d7c7f0fe801415f4 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1801,7 +1801,28 @@ asmlinkage int printk_emit(int facility, int level,
 }
 EXPORT_SYMBOL(printk_emit);
 
-int vprintk_default(const char *fmt, va_list args)
+#ifdef CONFIG_PRINTK
+#define define_pr_level(func, loglevel)                                \
+asmlinkage __visible void func(const char *fmt, ...)           \
+{                                                              \
+       va_list args;                                           \
+                                                               \
+       va_start(args, fmt);                                    \
+       vprintk_default(loglevel, fmt, args);                   \
+       va_end(args);                                           \
+}                                                              \
+EXPORT_SYMBOL(func)
+
+define_pr_level(__pr_emerg, LOGLEVEL_EMERG);
+define_pr_level(__pr_alert, LOGLEVEL_ALERT);
+define_pr_level(__pr_crit, LOGLEVEL_CRIT);
+define_pr_level(__pr_err, LOGLEVEL_ERR);
+define_pr_level(__pr_warn, LOGLEVEL_WARNING);
+define_pr_level(__pr_notice, LOGLEVEL_NOTICE);
+define_pr_level(__pr_info, LOGLEVEL_INFO);
+#endif
+
+int vprintk_default(int level, const char *fmt, va_list args)
 {
        int r;
 
@@ -1811,7 +1832,7 @@ int vprintk_default(const char *fmt, va_list args)
                return r;
        }
 #endif
-       r = vprintk_emit(0, LOGLEVEL_DEFAULT, NULL, 0, fmt, args);
+       r = vprintk_emit(0, level, NULL, 0, fmt, args);
 
        return r;
 }
@@ -1844,7 +1865,7 @@ asmlinkage __visible int printk(const char *fmt, ...)
        int r;
 
        va_start(args, fmt);
-       r = vprintk_func(fmt, args);
+       r = vprintk_func(LOGLEVEL_DEFAULT, fmt, args);
        va_end(args);
 
        return r;