Miroslav Franc 64e027
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Miroslav Franc 64e027
Date: Mon, 2 Jul 2018 10:54:02 +0200
Miroslav Franc 64e027
Subject: s390/sysinfo: add missing #ifdef CONFIG_PROC_FS
Miroslav Franc 64e027
Git-commit: 9f35b818a2f90fb6cb291aa0c9f835d4f0974a9a
Miroslav Franc 64e027
Patch-mainline: v4.19-rc1
Miroslav Franc 64e027
References: git-fixes bsc#1211366
Miroslav Franc 64e027
Miroslav Franc 64e027
Get rid of this compile warning for !PROC_FS:
Miroslav Franc 64e027
Miroslav Franc 64e027
  CC      arch/s390/kernel/sysinfo.o
Miroslav Franc 64e027
arch/s390/kernel/sysinfo.c:275:12: warning: 'sysinfo_show' defined but not used [-Wunused-function]
Miroslav Franc 64e027
 static int sysinfo_show(struct seq_file *m, void *v)
Miroslav Franc 64e027
Miroslav Franc 64e027
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Miroslav Franc 64e027
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Miroslav Franc 64e027
Acked-by: Miroslav Franc <mfranc@suse.cz>
Miroslav Franc 64e027
---
Miroslav Franc 64e027
 arch/s390/kernel/sysinfo.c | 4 ++++
Miroslav Franc 64e027
 1 file changed, 4 insertions(+)
Miroslav Franc 64e027
Miroslav Franc 64e027
diff --git a/arch/s390/kernel/sysinfo.c b/arch/s390/kernel/sysinfo.c
Miroslav Franc 64e027
index 54f5496913fa..12f80d1f0415 100644
Miroslav Franc 64e027
--- a/arch/s390/kernel/sysinfo.c
Miroslav Franc 64e027
+++ b/arch/s390/kernel/sysinfo.c
Miroslav Franc 64e027
@@ -59,6 +59,8 @@ int stsi(void *sysinfo, int fc, int sel1, int sel2)
Miroslav Franc 64e027
 }
Miroslav Franc 64e027
 EXPORT_SYMBOL(stsi);
Miroslav Franc 64e027
 
Miroslav Franc 64e027
+#ifdef CONFIG_PROC_FS
Miroslav Franc 64e027
+
Miroslav Franc 64e027
 static bool convert_ext_name(unsigned char encoding, char *name, size_t len)
Miroslav Franc 64e027
 {
Miroslav Franc 64e027
 	switch (encoding) {
Miroslav Franc 64e027
@@ -301,6 +303,8 @@ static int __init sysinfo_create_proc(void)
Miroslav Franc 64e027
 }
Miroslav Franc 64e027
 device_initcall(sysinfo_create_proc);
Miroslav Franc 64e027
 
Miroslav Franc 64e027
+#endif /* CONFIG_PROC_FS */
Miroslav Franc 64e027
+
Miroslav Franc 64e027
 /*
Miroslav Franc 64e027
  * Service levels interface.
Miroslav Franc 64e027
  */
Miroslav Franc 64e027