Merge tag 'block-5.6-2020-02-05' of git://git.kernel.dk/linux-block

[linux.git] / fs / proc / cpuinfo.c

diff --git a/fs/proc/cpuinfo.c b/fs/proc/cpuinfo.c
index 96f1087e372c19332d0acc23fb588a06cf10efe8..c1dea9b8222e1ab75bb61412b7b0cecbc7390a37 100644 (file)
--- a/fs/proc/cpuinfo.c
+++ b/fs/proc/cpuinfo.c
@@ -16,16 +16,16 @@ static int cpuinfo_open(struct inode *inode, struct file *file)
        return seq_open(file, &cpuinfo_op);
 }
 
-static const struct file_operations proc_cpuinfo_operations = {
-       .open           = cpuinfo_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = seq_release,
+static const struct proc_ops cpuinfo_proc_ops = {
+       .proc_open      = cpuinfo_open,
+       .proc_read      = seq_read,
+       .proc_lseek     = seq_lseek,
+       .proc_release   = seq_release,
 };
 
 static int __init proc_cpuinfo_init(void)
 {
-       proc_create("cpuinfo", 0, NULL, &proc_cpuinfo_operations);
+       proc_create("cpuinfo", 0, NULL, &cpuinfo_proc_ops);
        return 0;
 }
 fs_initcall(proc_cpuinfo_init);