The following commit has been merged into the x86/mtrr branch of tip: Commit-ID: bb2385bc38ffcea8afd0968e1895424e512c176c Gitweb: https://git.kernel.org/tip/bb2385bc38ffcea8afd0968e1895424e512c176c Author: Borislav Petkov <bp@xxxxxxx> AuthorDate: Fri, 08 Nov 2019 21:05:45 +01:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Fri, 08 Nov 2019 21:10:02 +01:00 x86/mtrr: Get rid of mtrr_seq_show() forward declaration ... by moving the function up in the file. No functional changes. Signed-off-by: Borislav Petkov <bp@xxxxxxx> Cc: x86@xxxxxxxxxx Link: https://lkml.kernel.org/r/20191108200815.24589-1-bp@xxxxxxxxx --- arch/x86/kernel/cpu/mtrr/if.c | 42 ++++++++++++++++------------------ 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c index 8e0cee8..79f0d2d 100644 --- a/arch/x86/kernel/cpu/mtrr/if.c +++ b/arch/x86/kernel/cpu/mtrr/if.c @@ -369,28 +369,6 @@ static int mtrr_close(struct inode *ino, struct file *file) return single_release(ino, file); } -static int mtrr_seq_show(struct seq_file *seq, void *offset); - -static int mtrr_open(struct inode *inode, struct file *file) -{ - if (!mtrr_if) - return -EIO; - if (!mtrr_if->get) - return -ENXIO; - return single_open(file, mtrr_seq_show, NULL); -} - -static const struct file_operations mtrr_fops = { - .owner = THIS_MODULE, - .open = mtrr_open, - .read = mtrr_read, - .llseek = seq_lseek, - .write = mtrr_write, - .unlocked_ioctl = mtrr_ioctl, - .compat_ioctl = mtrr_ioctl, - .release = mtrr_close, -}; - static int mtrr_seq_show(struct seq_file *seq, void *offset) { char factor; @@ -422,6 +400,26 @@ static int mtrr_seq_show(struct seq_file *seq, void *offset) return 0; } +static int mtrr_open(struct inode *inode, struct file *file) +{ + if (!mtrr_if) + return -EIO; + if (!mtrr_if->get) + return -ENXIO; + return single_open(file, mtrr_seq_show, NULL); +} + +static const struct file_operations mtrr_fops = { + .owner = THIS_MODULE, + .open = mtrr_open, + .read = mtrr_read, + .llseek = seq_lseek, + .write = mtrr_write, + .unlocked_ioctl = mtrr_ioctl, + .compat_ioctl = mtrr_ioctl, + .release = mtrr_close, +}; + static int __init mtrr_if_init(void) { struct cpuinfo_x86 *c = &boot_cpu_data;
![]() |