summaryrefslogtreecommitdiff
path: root/kernel/printk/sysctl.c
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@bootlin.com>2022-03-18 22:14:12 +0300
committerMiquel Raynal <miquel.raynal@bootlin.com>2022-03-18 22:14:42 +0300
commit4e371d996590f3a7e82a086d499c912c1930e968 (patch)
tree0c7b300670901f498238b32e59c307eddf338489 /kernel/printk/sysctl.c
parent8f877b7eab9d60a9deef6beae95656b77d55ab75 (diff)
parent151c6b49d679872d6fc0b50e0ad96303091694a2 (diff)
downloadlinux-4e371d996590f3a7e82a086d499c912c1930e968.tar.xz
Merge tag 'spi-nor/for-5.18' into mtd/next
SPI NOR core changes: - move vendor specific code out of the core into vendor drivers. - unify all function and object names in the vendor modules. - make setup() callback optional to improve readability. - skip erase logic when the SPI_NOR_NO_ERASE flag is set at flash declaration. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Diffstat (limited to 'kernel/printk/sysctl.c')
-rw-r--r--kernel/printk/sysctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk/sysctl.c b/kernel/printk/sysctl.c
index 653ae04aab7f..c228343eeb97 100644
--- a/kernel/printk/sysctl.c
+++ b/kernel/printk/sysctl.c
@@ -12,7 +12,7 @@
static const int ten_thousand = 10000;
static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
- void __user *buffer, size_t *lenp, loff_t *ppos)
+ void *buffer, size_t *lenp, loff_t *ppos)
{
if (write && !capable(CAP_SYS_ADMIN))
return -EPERM;