summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-07-31 01:40:21 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-31 04:25:14 +0400
commit61e99ab8e35a88b8c4d0f80d3df9ee16df471be5 (patch)
tree0bd8b37db94b22b3cd1dce2d6bbe65e6c353cb6e
parent088a52aac810655c1db1e40331e4936946701e9c (diff)
downloadlinux-61e99ab8e35a88b8c4d0f80d3df9ee16df471be5.tar.xz
printk: remove the now unnecessary "C" annotation for KERN_CONT
Now that all KERN_<LEVEL> uses are prefixed with ASCII SOH, there is no need for a KERN_CONT. Keep it backward compatible by adding #define KERN_CONT "" Reduces kernel image size a thousand bytes. Signed-off-by: Joe Perches <joe@perches.com> Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/kern_levels.h2
-rw-r--r--include/linux/printk.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/kern_levels.h b/include/linux/kern_levels.h
index 8c719a955b5b..866caaa9e2bb 100644
--- a/include/linux/kern_levels.h
+++ b/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/include/linux/printk.h b/include/linux/printk.h
index 93a231f9835c..9afc01e5a0a6 100644
--- a/include/linux/printk.h
+++ b/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;
}
}