Merge branch 'ks8695/boards' into next/boards

[sfrench/cifs-2.6.git] / include / linux / printk.h

diff --git a/include/linux/printk.h b/include/linux/printk.h
index 6e12e1f09047654e313289d3390585b77582df89..9afc01e5a0a61ce5f4a9fe1e53ad6e0fb1b8e5bf 100644 (file)
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -2,35 +2,17 @@
 #define __KERNEL_PRINTK__
 
 #include <linux/init.h>
+#include <linux/kern_levels.h>
 
 extern const char linux_banner[];
 extern const char linux_proc_banner[];
 
-#define KERN_EMERG     "<0>"   /* system is unusable                   */
-#define KERN_ALERT     "<1>"   /* action must be taken immediately     */
-#define KERN_CRIT      "<2>"   /* critical conditions                  */
-#define KERN_ERR       "<3>"   /* error conditions                     */
-#define KERN_WARNING   "<4>"   /* warning conditions                   */
-#define KERN_NOTICE    "<5>"   /* normal but significant condition     */
-#define KERN_INFO      "<6>"   /* informational                        */
-#define KERN_DEBUG     "<7>"   /* debug-level messages                 */
-
-/* Use the default kernel loglevel */
-#define KERN_DEFAULT   "<d>"
-/*
- * Annotation for a "continued" line of log printout (only done after a
- * line that had no enclosing \n). Only to be used by core/arch code
- * during early bootup (a continued line is not SMP-safe otherwise).
- */
-#define KERN_CONT      "<c>"
-
 static inline int printk_get_level(const char *buffer)
 {
-       if (buffer[0] == '<' && buffer[1] && buffer[2] == '>') {
+       if (buffer[0] == KERN_SOH_ASCII && buffer[1]) {
                switch (buffer[1]) {
                case '0' ... '7':
                case 'd':       /* KERN_DEFAULT */
-               case 'c':       /* KERN_CONT */
                        return buffer[1];
                }
        }
@@ -43,8 +25,7 @@ static inline const char *printk_skip_level(const char *buffer)
                switch (buffer[1]) {
                case '0' ... '7':
                case 'd':       /* KERN_DEFAULT */
-               case 'c':       /* KERN_CONT */
-                       return buffer + 3;
+                       return buffer + 2;
                }
        }
        return buffer;