Commit 436b2a80 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'printk-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk 

Pull printk updates from Petr Mladek:

 - Allow to print symbolic error names via new %pe modifier.

 - Use pr_warn() instead of the remaining pr_warning() calls. Fix
   formatting of the related lines.

 - Add VSPRINTF entry to MAINTAINERS.

* tag 'printk-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk: (32 commits)
  checkpatch: don't warn about new vsprintf pointer extension '%pe'
  MAINTAINERS: Add VSPRINTF
  tools lib api: Renaming pr_warning to pr_warn
  ASoC: samsung: Use pr_warn instead of pr_warning
  lib: cpu_rmap: Use pr_warn instead of pr_warning
  trace: Use pr_warn instead of pr_warning
  dma-debug: Use pr_warn instead of pr_warning
  vgacon: Use pr_warn instead of pr_warning
  fs: afs: Use pr_warn instead of pr_warning
  sh/intc: Use pr_warn instead of pr_warning
  scsi: Use pr_warn instead of pr_warning
  platform/x86: intel_oaktrail: Use pr_warn instead of pr_warning
  platform/x86: asus-laptop: Use pr_warn instead of pr_warning
  platform/x86: eeepc-laptop: Use pr_warn instead of pr_warning
  oprofile: Use pr_warn instead of pr_warning
  of: Use pr_warn instead of pr_warning
  macintosh: Use pr_warn instead of pr_warning
  idsn: Use pr_warn instead of pr_warning
  ide: Use pr_warn instead of pr_warning
  crypto: n2: Use pr_warn instead of pr_warning
  ...
parents 1b96a41b 1d281221

Documentation/core-api/printk-formats.rst

+12 −0
Original line number Diff line number Diff line
@@ -79,6 +79,18 @@ has the added benefit of providing a unique identifier. On 64-bit machines 
the first 32 bits are zeroed. The kernel will print ``(ptrval)`` until it

gathers enough entropy. If you *really* want the address see %px below.



Error Pointers

--------------



::



	%pe	-ENOSPC



For printing error pointers (i.e. a pointer for which IS_ERR() is true)

as a symbolic error name. Error values for which no symbolic name is

known are printed in decimal, while a non-ERR_PTR passed as the

argument to %pe gets treated as ordinary %p.



Symbols/Function Pointers

-------------------------

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -17474,6 +17474,18 @@ S: Maintained 
F:	drivers/net/vrf.c

F:	Documentation/networking/vrf.txt













VSPRINTF













M:	Petr Mladek <pmladek@suse.com>













M:	Steven Rostedt <rostedt@goodmis.org>













M:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>













R:	Andy Shevchenko <andriy.shevchenko@linux.intel.com>













R:	Rasmus Villemoes <linux@rasmusvillemoes.dk>













T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git













S:	Maintained













F:	lib/vsprintf.c













F:	lib/test_printf.c













F:	Documentation/core-api/printk-formats.rst



























VT1211 HARDWARE MONITOR DRIVER















M:	Juerg Haefliger <juergh@gmail.com>















L:	linux-hwmon@vger.kernel.org

































arch/alpha/kernel/perf_event.c



+2
−2






























Original line number
Diff line number
Diff line








@@ -824,7 +824,7 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr,













	if (unlikely(la_ptr >= alpha_pmu->num_pmcs)) {















		/* This should never occur! */















		irq_err_count++;













		pr_warning("PMI: silly index %ld\n", la_ptr);













		pr_warn("PMI: silly index %ld\n", la_ptr);















		wrperfmon(PERFMON_CMD_ENABLE, cpuc->idx_mask);















		return;















	}









@@ -847,7 +847,7 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr,













	if (unlikely(!event)) {















		/* This should never occur! */















		irq_err_count++;













		pr_warning("PMI: No event at index %d!\n", idx);













		pr_warn("PMI: No event at index %d!\n", idx);















		wrperfmon(PERFMON_CMD_ENABLE, cpuc->idx_mask);















		return;















	}

































arch/arm64/kernel/hw_breakpoint.c



+4
−4






























Original line number
Diff line number
Diff line








@@ -51,7 +51,7 @@ int hw_breakpoint_slots(int type)













	case TYPE_DATA:















		return get_num_wrps();















	default:













		pr_warning("unknown slot type: %d\n", type);













		pr_warn("unknown slot type: %d\n", type);















		return 0;















	}















}










@@ -112,7 +112,7 @@ static u64 read_wb_reg(int reg, int n)













	GEN_READ_WB_REG_CASES(AARCH64_DBG_REG_WVR, AARCH64_DBG_REG_NAME_WVR, val);















	GEN_READ_WB_REG_CASES(AARCH64_DBG_REG_WCR, AARCH64_DBG_REG_NAME_WCR, val);















	default:













		pr_warning("attempt to read from unknown breakpoint register %d\n", n);













		pr_warn("attempt to read from unknown breakpoint register %d\n", n);















	}































	return val;









@@ -127,7 +127,7 @@ static void write_wb_reg(int reg, int n, u64 val)













	GEN_WRITE_WB_REG_CASES(AARCH64_DBG_REG_WVR, AARCH64_DBG_REG_NAME_WVR, val);















	GEN_WRITE_WB_REG_CASES(AARCH64_DBG_REG_WCR, AARCH64_DBG_REG_NAME_WCR, val);















	default:













		pr_warning("attempt to write to unknown breakpoint register %d\n", n);













		pr_warn("attempt to write to unknown breakpoint register %d\n", n);















	}















	isb();















}









@@ -145,7 +145,7 @@ static enum dbg_active_el debug_exception_level(int privilege)













	case AARCH64_BREAKPOINT_EL1:















		return DBG_ACTIVE_EL1;















	default:













		pr_warning("invalid breakpoint privilege level %d\n", privilege);













		pr_warn("invalid breakpoint privilege level %d\n", privilege);















		return -EINVAL;















	}















}

































arch/arm64/kernel/smp.c



+5
−6






























Original line number
Diff line number
Diff line








@@ -345,8 +345,7 @@ void __cpu_die(unsigned int cpu)













	 */















	err = op_cpu_kill(cpu);















	if (err)













		pr_warn("CPU%d may not have shut down cleanly: %d\n",













			cpu, err);













		pr_warn("CPU%d may not have shut down cleanly: %d\n", cpu, err);















}































/*










@@ -976,7 +975,7 @@ void smp_send_stop(void)













		udelay(1);































	if (num_online_cpus() > 1)













		pr_warning("SMP: failed to stop secondary CPUs %*pbl\n",













		pr_warn("SMP: failed to stop secondary CPUs %*pbl\n",















			cpumask_pr_args(cpu_online_mask));































	sdei_mask_local_cpu();










@@ -1017,7 +1016,7 @@ void crash_smp_send_stop(void)













		udelay(1);































	if (atomic_read(&waiting_for_crash_ipi) > 0)













		pr_warning("SMP: failed to stop secondary CPUs %*pbl\n",













		pr_warn("SMP: failed to stop secondary CPUs %*pbl\n",















			cpumask_pr_args(&mask));































	sdei_mask_local_cpu();









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE