From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Nov 2019 03:40:40 +0000 (-0800)
Subject: Merge tag 'printk-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=436b2a8039ac00f8dc6ae8f3bd2be83748f72312;p=linux.git

Merge tag 'printk-for-5.5' of git://git./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
  ...
---

436b2a8039ac00f8dc6ae8f3bd2be83748f72312
diff --cc arch/x86/kernel/umip.c
index 548fefed71eec,de340e47f82d8..b4a3048931898
--- a/arch/x86/kernel/umip.c
+++ b/arch/x86/kernel/umip.c
@@@ -380,17 -370,16 +380,17 @@@ bool fixup_umip_exception(struct pt_reg
  	if (umip_inst < 0)
  		return false;
  
- 	umip_pr_warning(regs, "%s instruction cannot be used by applications.\n",
+ 	umip_pr_warn(regs, "%s instruction cannot be used by applications.\n",
  			umip_insns[umip_inst]);
  
 -	/* Do not emulate SLDT, STR or user long mode processes. */
 -	if (umip_inst == UMIP_INST_STR || umip_inst == UMIP_INST_SLDT || user_64bit_mode(regs))
 +	/* Do not emulate (spoof) SLDT or STR. */
 +	if (umip_inst == UMIP_INST_STR || umip_inst == UMIP_INST_SLDT)
  		return false;
  
- 	umip_pr_warning(regs, "For now, expensive software emulation returns the result.\n");
+ 	umip_pr_warn(regs, "For now, expensive software emulation returns the result.\n");
  
 -	if (emulate_umip_insn(&insn, umip_inst, dummy_data, &dummy_data_size))
 +	if (emulate_umip_insn(&insn, umip_inst, dummy_data, &dummy_data_size,
 +			      user_64bit_mode(regs)))
  		return false;
  
  	/*