Commit 43d6ecd9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5b4049d8 739e7116

init/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ config LOG_CPU_MAX_BUF_SHIFT 
	  with more CPUs. Therefore this value is used only when the sum of

	  contributions is greater than the half of the default kernel ring

	  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

	  used as it forces an exact (power of two) size of the ring buffer.

kernel/printk/printk.c

+2 −2
Original line number Diff line number Diff line
@@ -528,8 +528,8 @@ static int log_store(u32 caller_id, int facility, int level, 
	if (dev_info)

		memcpy(&r.info->dev_info, dev_info, sizeof(r.info->dev_info));



	/* insert message */

	if ((flags & LOG_CONT) || !(flags & LOG_NEWLINE))

	/* A message without a trailing newline can be continued. */

	if (!(flags & LOG_NEWLINE))

		prb_commit(&e);

	else

		prb_final_commit(&e);

kernel/printk/printk_ringbuffer.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE