From: 黄涛 Date: Sat, 30 Jul 2011 14:44:38 +0000 (+0800) Subject: Revert "printk: Fix log_buf_copy termination." X-Git-Tag: firefly_0821_release~9946 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c68ee91f0267ec9699c3b30ce87061bcc9e7047d;p=firefly-linux-kernel-4.4.55.git Revert "printk: Fix log_buf_copy termination." This reverts commit 8a3025c963926f1cc36b15f6b95b9da0c1ab1cdf. --- diff --git a/kernel/printk.c b/kernel/printk.c index 16fbcf7a2de3..e89b123a2ebb 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -285,8 +285,8 @@ int log_buf_copy(char *dest, int idx, int len) if (idx < 0 || idx >= max) { ret = -1; } else { - if (len > max - idx) - len = max - idx; + if (len > max) + len = max; ret = len; idx += (log_end - max); while (len-- > 0)