From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 10 May 2018 20:47:32 +0000 (+0200)
Subject: x86/bugs: Make cpu_show_common() static
X-Git-Tag: v4.1.12-124.31.3~750
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a93afcc55e4d89e4c786ff178eee3f1b4e38ff64;p=users%2Fjedix%2Flinux-maple.git

x86/bugs: Make cpu_show_common() static

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>
---

diff --git a/arch/x86/kernel/cpu/bugs_64.c b/arch/x86/kernel/cpu/bugs_64.c
index f6e68098bbae..595594ccb25c 100644
--- a/arch/x86/kernel/cpu/bugs_64.c
+++ b/arch/x86/kernel/cpu/bugs_64.c
@@ -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))