diff --git a/[refs] b/[refs] index d5040b43f93b..829b3aec6621 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 088a52aac810655c1db1e40331e4936946701e9c +refs/heads/master: 61e99ab8e35a88b8c4d0f80d3df9ee16df471be5 diff --git a/trunk/include/linux/kern_levels.h b/trunk/include/linux/kern_levels.h index 8c719a955b5b..866caaa9e2bb 100644 --- a/trunk/include/linux/kern_levels.h +++ b/trunk/include/linux/kern_levels.h @@ -20,6 +20,6 @@ * 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 KERN_SOH "c" +#define KERN_CONT "" #endif diff --git a/trunk/include/linux/printk.h b/trunk/include/linux/printk.h index 93a231f9835c..9afc01e5a0a6 100644 --- a/trunk/include/linux/printk.h +++ b/trunk/include/linux/printk.h @@ -13,7 +13,6 @@ static inline int printk_get_level(const char *buffer) switch (buffer[1]) { case '0' ... '7': case 'd': /* KERN_DEFAULT */ - case 'c': /* KERN_CONT */ return buffer[1]; } } @@ -26,7 +25,6 @@ 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 + 2; } }