diff --git a/[refs] b/[refs] index d697accc4b98..3a9daddedb2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ad6ecf9146e85ccb4e0bce70b91a93f57145c72 +refs/heads/master: 4749252776712e587c7c7619cbf0342b080c7f44 diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h index b2ea36e5b6b9..94bc99656963 100644 --- a/trunk/include/linux/kernel.h +++ b/trunk/include/linux/kernel.h @@ -76,6 +76,13 @@ extern const char linux_proc_banner[]; #define KERN_INFO "<6>" /* informational */ #define KERN_DEBUG "<7>" /* debug-level messages */ +/* + * 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 "" + extern int console_printk[]; #define console_loglevel (console_printk[0])