]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
x86/bugs: Make cpu_show_common() static
authorJiri Kosina <jkosina@suse.cz>
Thu, 10 May 2018 20:47:32 +0000 (22:47 +0200)
committerBrian Maly <brian.maly@oracle.com>
Mon, 21 May 2018 22:06:39 +0000 (18:06 -0400)
cpu_show_common() is not used outside of arch/x86/kernel/cpu/bugs.c, so
make it static.

OraBug: 28041771
CVE: CVE-2018-3639

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
(cherry picked from commit 7bb4d366cba992904bffa4820d24e70a3de93e76)
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Mihai Carabas <mihai.carabas@oracle.com>
 Conflicts:
arch/x86/kernel/cpu/bugs.c
[It is called bugs_64.c]

Signed-off-by: Brian Maly <brian.maly@oracle.com>
arch/x86/kernel/cpu/bugs_64.c

index f6e68098bbaebdcf07ea40cadfd4757131e47104..595594ccb25c1c12efe09f051fb3fb3f2ed946bb 100644 (file)
@@ -914,7 +914,7 @@ void x86_spec_ctrl_setup_ap(void)
 }
 
 #ifdef CONFIG_SYSFS
-ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr,
+static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr,
                        char *buf, unsigned int bug)
 {
        if (!boot_cpu_has_bug(bug))