From 64e027bbdced03b3192ae7b3e3862e021d527e20 Mon Sep 17 00:00:00 2001 From: Miroslav Franc Date: May 12 2023 18:30:55 +0000 Subject: s390/sysinfo: add missing #ifdef CONFIG_PROC_FS (git-fixes bsc#1211366). --- diff --git a/patches.suse/s390-sysinfo-add-missing-ifdef-CONFIG_PROC_FS.patch b/patches.suse/s390-sysinfo-add-missing-ifdef-CONFIG_PROC_FS.patch new file mode 100644 index 0000000..45b3d09 --- /dev/null +++ b/patches.suse/s390-sysinfo-add-missing-ifdef-CONFIG_PROC_FS.patch @@ -0,0 +1,43 @@ +From: Heiko Carstens +Date: Mon, 2 Jul 2018 10:54:02 +0200 +Subject: s390/sysinfo: add missing #ifdef CONFIG_PROC_FS +Git-commit: 9f35b818a2f90fb6cb291aa0c9f835d4f0974a9a +Patch-mainline: v4.19-rc1 +References: git-fixes bsc#1211366 + +Get rid of this compile warning for !PROC_FS: + + CC arch/s390/kernel/sysinfo.o +arch/s390/kernel/sysinfo.c:275:12: warning: 'sysinfo_show' defined but not used [-Wunused-function] + static int sysinfo_show(struct seq_file *m, void *v) + +Signed-off-by: Heiko Carstens +Signed-off-by: Martin Schwidefsky +Acked-by: Miroslav Franc +--- + arch/s390/kernel/sysinfo.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/arch/s390/kernel/sysinfo.c b/arch/s390/kernel/sysinfo.c +index 54f5496913fa..12f80d1f0415 100644 +--- a/arch/s390/kernel/sysinfo.c ++++ b/arch/s390/kernel/sysinfo.c +@@ -59,6 +59,8 @@ int stsi(void *sysinfo, int fc, int sel1, int sel2) + } + EXPORT_SYMBOL(stsi); + ++#ifdef CONFIG_PROC_FS ++ + static bool convert_ext_name(unsigned char encoding, char *name, size_t len) + { + switch (encoding) { +@@ -301,6 +303,8 @@ static int __init sysinfo_create_proc(void) + } + device_initcall(sysinfo_create_proc); + ++#endif /* CONFIG_PROC_FS */ ++ + /* + * Service levels interface. + */ + diff --git a/series.conf b/series.conf index 8c456c9..99cca47 100644 --- a/series.conf +++ b/series.conf @@ -36253,6 +36253,7 @@ patches.suse/s390-scm_blk-correct-numa_node-in-scm_blk_dev_setup.patch patches.suse/s390-extmem-fix-gcc-8-stringop-overflow-warning.patch patches.suse/s390-sles15sp1-00-03-07-zcrypt-add-copy_from_user-length-plausibility-c.patch + patches.suse/s390-sysinfo-add-missing-ifdef-CONFIG_PROC_FS.patch patches.suse/0085-RAID-s390-Remove-VLA-usage.patch patches.suse/s390-mm-correct-allocate_pgste-proc_handler-callback.patch patches.suse/s390-sles15-16-01-kvm-fix-deadlock-when-killed-by-oom.patch