summaryrefslogtreecommitdiff
path: root/kernel/printk/printk_ringbuffer.c
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.com>2021-01-21 16:06:21 +0100
committerPetr Mladek <pmladek@suse.com>2021-01-21 16:06:21 +0100
commit535b6a122c6b43af5772ca39cbff7056749aae74 (patch)
tree9b2eda3b3c60581895bf862736b8c761f3325a59 /kernel/printk/printk_ringbuffer.c
parenta91bd6223ecd46addc71ee6fcd432206d39365d2 (diff)
parentf0e386ee0c0b71ea6f7238506a4d0965a2dbef11 (diff)
Merge branch 'printk-rework' into for-linus
Diffstat (limited to 'kernel/printk/printk_ringbuffer.c')
-rw-r--r--kernel/printk/printk_ringbuffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk/printk_ringbuffer.c b/kernel/printk/printk_ringbuffer.c
index 6704f06e0417..8a7b7362c0dd 100644
--- a/kernel/printk/printk_ringbuffer.c
+++ b/kernel/printk/printk_ringbuffer.c
@@ -1718,7 +1718,7 @@ static bool copy_data(struct prb_data_ring *data_ring,
/* Caller interested in the line count? */
if (line_count)
- *line_count = count_lines(data, data_size);
+ *line_count = count_lines(data, len);
/* Caller interested in the data content? */
if (!buf || !buf_size)