git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'printk-for-5.10-rc6-fixup' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
kernel
/
printk
/
printk_ringbuffer.c
diff --git
a/kernel/printk/printk_ringbuffer.c
b/kernel/printk/printk_ringbuffer.c
index 6b152568527708ed618e947520fbbafe96c1237d..74e25a1704f2b7ee1fe0e873f68b51395bcec426 100644
(file)
--- 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);