diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-07-06 17:19:55 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-07-06 17:19:55 +0200 |
| commit | fb5dbf6a60f53737d0d03a3a98e3815e09f2c5d9 (patch) | |
| tree | 1ee0adfe9aa5889d790fe99321cecbd573d89cc0 | |
| parent | 477095d03eabb3bc15c53e97dc880e80d631831c (diff) | |
| download | patches-fb5dbf6a60f53737d0d03a3a98e3815e09f2c5d9.tar.gz | |
update
| -rw-r--r-- | 02-kmsg-facility-len.patch | 13 | ||||
| -rw-r--r-- | 03-kmsg-nonblock-race.patch | 2 | ||||
| -rw-r--r-- | series | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/02-kmsg-facility-len.patch b/02-kmsg-facility-len.patch index e4197b6..2ed06c7 100644 --- a/02-kmsg-facility-len.patch +++ b/02-kmsg-facility-len.patch @@ -15,8 +15,8 @@ On Tue, Jul 3, 2012 at 12:45 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote: Cc: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Kay Sievers <kay@vrfy.org> --- - kernel/printk.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) + kernel/printk.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) --- a/kernel/printk.c +++ b/kernel/printk.c @@ -33,12 +33,13 @@ Signed-off-by: Kay Sievers <kay@vrfy.org> } else { len += 3; - if (msg->level > 9) -+ if (prefix > 9) - len++; +- len++; - if (msg->level > 99) -+ if (prefix > 99) -+ len++; + if (prefix > 999) ++ len += 3; ++ else if (prefix > 99) ++ len += 2; ++ else if (prefix > 9) len++; } } diff --git a/03-kmsg-nonblock-race.patch b/03-kmsg-nonblock-race.patch index 9c36d7b..0135227 100644 --- a/03-kmsg-nonblock-race.patch +++ b/03-kmsg-nonblock-race.patch @@ -25,7 +25,7 @@ is in the meantime covered by: 116e90b23f74d303e8d607c7a7d54f60f14ab9f2 Cc: Yuanhan Liu <yuanhan.liu@linux.intel.com> -Cc: Jan Beulich <JBeulich@suse.com> +Acked-by: Jan Beulich <jbeulich@suse.com> Signed-off-by: Kay Sievers <kay@vrfy.org> --- kernel/printk.c | 9 +-------- @@ -4,3 +4,4 @@ 02-kmsg-facility-len.patch 03-kmsg-nonblock-race.patch 04-kmsg-cons-fix.patch +test |