[PATCH 8/8] printk: Remove the now unnecessary "C" annotation for KERN_CONT

Joe Perches
2012-06-05T09:48:14Z

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>
---
include/linux/kern_levels.h | 2 +-
include/linux/printk.h | 2 --
2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/include/linux/kern_levels.h b/include/linux/kern_levels.h
index 8c719a9..866caaa 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 93a231f..9afc01e 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;
}
}
--
1.7.8.111.gad25c.dirty