ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'printk-for-5.10-rc6-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux

Browse Source 
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
This commit is contained in:
Linus Torvalds
2020-11-27 10:38:36 -08:00
parent 5b4049d8fc 739e7116b1
commit 43d6ecd97c
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
init/Kconfig
View File

@@ -719,7 +719,7 @@ config LOG_CPU_MAX_BUF_SHIFT
with more CPUs. Therefore this value is used only when the sum of with more CPUs. Therefore this value is used only when the sum of
contributions is greater than the half of the default kernel ring contributions is greater than the half of the default kernel ring
buffer as defined by LOG_BUF_SHIFT. The default values are set buffer as defined by LOG_BUF_SHIFT. The default values are set
so that more than 64 CPUs are needed to trigger the allocation. so that more than 16 CPUs are needed to trigger the allocation.
Also this option is ignored when "log_buf_len" kernel parameter is Also this option is ignored when "log_buf_len" kernel parameter is
used as it forces an exact (power of two) size of the ring buffer. used as it forces an exact (power of two) size of the ring buffer.

4
kernel/printk/printk.c
View File

@@ -528,8 +528,8 @@ static int log_store(u32 caller_id, int facility, int level,
if (dev_info) if (dev_info)
memcpy(&r.info->dev_info, dev_info, sizeof(r.info->dev_info)); memcpy(&r.info->dev_info, dev_info, sizeof(r.info->dev_info));
/* insert message */ /* A message without a trailing newline can be continued. */
if ((flags & LOG_CONT) || !(flags & LOG_NEWLINE)) if (!(flags & LOG_NEWLINE))
prb_commit(&e); prb_commit(&e);
else else
prb_final_commit(&e); prb_final_commit(&e);

2
kernel/printk/printk_ringbuffer.c
View File

@@ -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) */ head_id = atomic_long_read(&desc_ring->head_id); /* LMM(desc_reserve:A) */
do { do {
desc = to_desc(desc_ring, head_id);
id = DESC_ID(head_id + 1); id = DESC_ID(head_id + 1);
id_prev_wrap = DESC_ID_PREV_WRAP(desc_ring, id); id_prev_wrap = DESC_ID_PREV_WRAP(desc_ring, id);