diff options
author | Linus Torvalds | 2020-11-27 10:38:36 -0800 |
---|---|---|
committer | Linus Torvalds | 2020-11-27 10:38:36 -0800 |
commit | 43d6ecd97c0c69acffc918cc18cdabdfcaa55354 (patch) | |
tree | 62c04188c3f92e1fa85172872a6d587d0a07ac26 /kernel/printk/printk_ringbuffer.c | |
parent | 5b4049d8fc8353c20493f3767a1270a61bcc3822 (diff) | |
parent | 739e7116b10bf8694795ed8365dd7cbe089b662a (diff) |
Merge tag 'printk-for-5.10-rc6-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux
Pull printk fixes from Petr Mladek:
- do not lose trailing newline in pr_cont() calls
- two trivial fixes for a dead store and a config description
* tag 'printk-for-5.10-rc6-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
printk: finalize records with trailing newlines
printk: remove unneeded dead-store assignment
init/Kconfig: Fix CPU number in LOG_CPU_MAX_BUF_SHIFT description
Diffstat (limited to 'kernel/printk/printk_ringbuffer.c')
-rw-r--r-- | kernel/printk/printk_ringbuffer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/printk/printk_ringbuffer.c b/kernel/printk/printk_ringbuffer.c index 6b1525685277..74e25a1704f2 100644 --- a/kernel/printk/printk_ringbuffer.c +++ b/kernel/printk/printk_ringbuffer.c @@ -882,8 +882,6 @@ static bool desc_reserve(struct printk_ringbuffer *rb, unsigned long *id_out) head_id = atomic_long_read(&desc_ring->head_id); /* LMM(desc_reserve:A) */ do { - desc = to_desc(desc_ring, head_id); - id = DESC_ID(head_id + 1); id_prev_wrap = DESC_ID_PREV_WRAP(desc_ring, id); |