diff options
| author | Petr Mladek <pmladek@suse.com> | 2020-06-01 10:15:16 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2020-06-01 10:15:16 +0200 |
| commit | d053cf0d771f6547cb0537759a9af63cf402908d (patch) | |
| tree | df61806e45c6cf7e9cdd0b271f959f0962f8623e /kernel/configs.c | |
| parent | 6a0af9fc8ccef5304ef88dc7e27362732e047076 (diff) | |
| parent | eb012d125a2419786f5bcaaf8a901babc7b6e3d7 (diff) | |
| download | linux-next-d053cf0d771f6547cb0537759a9af63cf402908d.tar.gz linux-next-d053cf0d771f6547cb0537759a9af63cf402908d.zip | |
Merge branch 'for-5.8' into for-linus
Diffstat (limited to 'kernel/configs.c')
| -rw-r--r-- | kernel/configs.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/configs.c b/kernel/configs.c index c09ea4c995e1..a28c79c5f713 100644 --- a/kernel/configs.c +++ b/kernel/configs.c @@ -47,10 +47,9 @@ ikconfig_read_current(struct file *file, char __user *buf, &kernel_config_data); } -static const struct file_operations ikconfig_file_ops = { - .owner = THIS_MODULE, - .read = ikconfig_read_current, - .llseek = default_llseek, +static const struct proc_ops config_gz_proc_ops = { + .proc_read = ikconfig_read_current, + .proc_lseek = default_llseek, }; static int __init ikconfig_init(void) @@ -59,7 +58,7 @@ static int __init ikconfig_init(void) /* create the current config file */ entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL, - &ikconfig_file_ops); + &config_gz_proc_ops); if (!entry) return -ENOMEM; |