diff --git a/[refs] b/[refs] index 7ded50c7aa8f..f44bd543f577 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13d77c37cab2bb906022309e1e7182c327e49916 +refs/heads/master: 37c00b84d0c1b5c4c65ae837e2235160c03e84c2 diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index bee36100f110..9adc2a473e6e 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -666,7 +666,7 @@ asmlinkage int vprintk(const char *fmt, va_list args) } /* Emit the output into the temporary buffer */ printed_len += vscnprintf(printk_buf + printed_len, - sizeof(printk_buf), fmt, args); + sizeof(printk_buf) - printed_len, fmt, args); /* * Copy the output into log_buf. If the caller didn't provide