diff options
author | Joe Perches <joe@perches.com> | 2012-07-30 17:40:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 20:25:14 -0400 |
commit | 61e99ab8e35a88b8c4d0f80d3df9ee16df471be5 (patch) | |
tree | 0bd8b37db94b22b3cd1dce2d6bbe65e6c353cb6e /include | |
parent | 088a52aac810655c1db1e40331e4936946701e9c (diff) |
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>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/kern_levels.h | 2 | ||||
-rw-r--r-- | 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 8c719a955b5b..866caaa9e2bb 100644 --- a/include/linux/kern_levels.h +++ b/include/linux/kern_levels.h | |||
@@ -20,6 +20,6 @@ | |||
20 | * line that had no enclosing \n). Only to be used by core/arch code | 20 | * line that had no enclosing \n). Only to be used by core/arch code |
21 | * during early bootup (a continued line is not SMP-safe otherwise). | 21 | * during early bootup (a continued line is not SMP-safe otherwise). |
22 | */ | 22 | */ |
23 | #define KERN_CONT KERN_SOH "c" | 23 | #define KERN_CONT "" |
24 | 24 | ||
25 | #endif | 25 | #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) | |||
13 | switch (buffer[1]) { | 13 | switch (buffer[1]) { |
14 | case '0' ... '7': | 14 | case '0' ... '7': |
15 | case 'd': /* KERN_DEFAULT */ | 15 | case 'd': /* KERN_DEFAULT */ |
16 | case 'c': /* KERN_CONT */ | ||
17 | return buffer[1]; | 16 | return buffer[1]; |
18 | } | 17 | } |
19 | } | 18 | } |
@@ -26,7 +25,6 @@ static inline const char *printk_skip_level(const char *buffer) | |||
26 | switch (buffer[1]) { | 25 | switch (buffer[1]) { |
27 | case '0' ... '7': | 26 | case '0' ... '7': |
28 | case 'd': /* KERN_DEFAULT */ | 27 | case 'd': /* KERN_DEFAULT */ |
29 | case 'c': /* KERN_CONT */ | ||
30 | return buffer + 2; | 28 | return buffer + 2; |
31 | } | 29 | } |
32 | } | 30 | } |