diff options
author | Colin Cross | 2013-03-13 19:16:02 -0500 |
---|---|---|
committer | Colin Cross | 2013-03-13 19:16:02 -0500 |
commit | 0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f (patch) | |
tree | 9bab760a750d9cf4504d92603ee7fc82beeb2e38 /kernel/printk.c | |
parent | a276def548828763cf5ac228adf8c1ca73f8d4d3 (diff) | |
parent | e28c3f2b514b5581e15614f7cf976131092cf4b6 (diff) | |
download | kernel-common-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.tar.gz kernel-common-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.tar.xz kernel-common-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.zip |
Merge tag 'v3.0.68' into android-3.0
This is the 3.0.68 stable release
Conflicts:
kernel/cgroup.c
Change-Id: I067982d25e18e3a12de93a5eb6429b8829d7ca11
Diffstat (limited to 'kernel/printk.c')
-rw-r--r-- | kernel/printk.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 24146142bc0..a1d702c1313 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -684,8 +684,19 @@ static void call_console_drivers(unsigned start, unsigned end) | |||
684 | start_print = start; | 684 | start_print = start; |
685 | while (cur_index != end) { | 685 | while (cur_index != end) { |
686 | if (msg_level < 0 && ((end - cur_index) > 2)) { | 686 | if (msg_level < 0 && ((end - cur_index) > 2)) { |
687 | /* | ||
688 | * prepare buf_prefix, as a contiguous array, | ||
689 | * to be processed by log_prefix function | ||
690 | */ | ||
691 | char buf_prefix[SYSLOG_PRI_MAX_LENGTH+1]; | ||
692 | unsigned i; | ||
693 | for (i = 0; i < ((end - cur_index)) && (i < SYSLOG_PRI_MAX_LENGTH); i++) { | ||
694 | buf_prefix[i] = LOG_BUF(cur_index + i); | ||
695 | } | ||
696 | buf_prefix[i] = '\0'; /* force '\0' as last string character */ | ||
697 | |||
687 | /* strip log prefix */ | 698 | /* strip log prefix */ |
688 | cur_index += log_prefix(&LOG_BUF(cur_index), &msg_level, NULL); | 699 | cur_index += log_prefix((const char *)&buf_prefix, &msg_level, NULL); |
689 | start_print = cur_index; | 700 | start_print = cur_index; |
690 | } | 701 | } |
691 | while (cur_index != end) { | 702 | while (cur_index != end) { |