From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Oct 2022 18:24:19 +0000 (-0700)
Subject: Merge tag 'printk-for-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/printk... 
X-Git-Tag: 6.1-rc-smb3-client-fixes-part2~39
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=b520410654103086ccc0d339c0ff645d4c4dd697;p=sfrench%2Fcifs-2.6.git

Merge tag 'printk-for-6.1' of git://git./linux/kernel/git/printk/linux

Pull printk updates from Petr Mladek:

 - Initialize pointer hashing using the system workqueue. It avoids
   taking locks in printk()/vsprintf() code path

 - Misc code clean up

* tag 'printk-for-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
  printk: Mark __printk percpu data ready __ro_after_init
  printk: Remove bogus comment vs. boot consoles
  printk: Remove write only variable nr_ext_console_drivers
  printk: Declare log_wait properly
  printk: Make pr_flush() static
  lib/vsprintf: Initialize vsprintf's pointer hash once the random core is ready.
  lib/vsprintf: Remove static_branch_likely() from __ptr_to_hashval().
  lib/vnsprintf: add const modifier for param 'bitmap'
---

b520410654103086ccc0d339c0ff645d4c4dd697
diff --cc fs/proc/kmsg.c
index 592e6dc7c110,9d6950ac10fe..2fc92a13f9f8
--- a/fs/proc/kmsg.c
+++ b/fs/proc/kmsg.c
@@@ -15,10 -15,9 +15,8 @@@
  #include <linux/fs.h>
  #include <linux/syslog.h>
  
 -#include <linux/uaccess.h>
  #include <asm/io.h>
  
- extern wait_queue_head_t log_wait;
- 
  static int kmsg_open(struct inode * inode, struct file * file)
  {
  	return do_syslog(SYSLOG_ACTION_OPEN, NULL, 0, SYSLOG_FROM_PROC);