diff options
| author | Kay Sievers <kay@vrfy.org> | 2012-07-06 15:23:36 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-07-06 15:23:36 +0200 |
| commit | ed6949e5abbba7a2be8ad5946afb340d7fa62614 (patch) | |
| tree | 1ee615c3a2752de6d30f8679ae7d34e5a6b62834 | |
| parent | 116949cb68ef5c93210783dd88c4db3c11c4f610 (diff) | |
| download | patches-ed6949e5abbba7a2be8ad5946afb340d7fa62614.tar.gz | |
update
| -rw-r--r-- | 00-kmsg-spinlock_irq.patch | 1 | ||||
| -rw-r--r-- | 02-kmsg-facility-len.patch | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/00-kmsg-spinlock_irq.patch b/00-kmsg-spinlock_irq.patch index 7271015..7043be8 100644 --- a/00-kmsg-spinlock_irq.patch +++ b/00-kmsg-spinlock_irq.patch @@ -12,6 +12,7 @@ logbuf_lock spin also, it will cause deadlock. So we should use raw_spin_lock/unlock_irq here. +Acked-by: Kay Sievers <kay@vrfy.org> Signed-off-by: liu chuansheng <chuansheng.liu@intel.com> --- kernel/printk.c | 24 ++++++++++++------------ diff --git a/02-kmsg-facility-len.patch b/02-kmsg-facility-len.patch index 70fd915..e4197b6 100644 --- a/02-kmsg-facility-len.patch +++ b/02-kmsg-facility-len.patch @@ -15,12 +15,12 @@ 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 | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) + kernel/printk.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) --- a/kernel/printk.c +++ b/kernel/printk.c -@@ -818,15 +818,16 @@ static size_t print_time(u64 ts, char *b +@@ -818,15 +818,18 @@ static size_t print_time(u64 ts, char *b static size_t print_prefix(const struct log *msg, bool syslog, char *buf) { size_t len = 0; @@ -37,6 +37,8 @@ Signed-off-by: Kay Sievers <kay@vrfy.org> len++; - if (msg->level > 99) + if (prefix > 99) ++ len++; ++ if (prefix > 999) len++; } } |