From 1cd668a0340e378883093c7f4fcaa0aca3c7e94d Mon Sep 17 00:00:00 2001 From: Kernel Build Daemon Date: Jan 07 2020 06:25:40 +0000 Subject: Merge branch 'SLE15-SP1' into SLE12-SP5 --- diff --git a/patches.suse/powerpc-pseries-Drop-pointless-static-qualifier-in-v.patch b/patches.suse/powerpc-pseries-Drop-pointless-static-qualifier-in-v.patch new file mode 100644 index 0000000..54fa983 --- /dev/null +++ b/patches.suse/powerpc-pseries-Drop-pointless-static-qualifier-in-v.patch @@ -0,0 +1,39 @@ +From 11dd34f3eae5a468013bb161a1dcf1fecd2ca321 Mon Sep 17 00:00:00 2001 +From: YueHaibing +Date: Mon, 18 Feb 2019 12:56:44 +0000 +Subject: [PATCH] powerpc/pseries: Drop pointless static qualifier in + vpa_debugfs_init() + +References: FATE#326394 git-fixes +Patch-mainline: v5.5-rc1 +Git-commit: 11dd34f3eae5a468013bb161a1dcf1fecd2ca321 + +There is no need to have the 'struct dentry *vpa_dir' variable static +since new value always be assigned before use it. + +Fixes: c6c26fb55e8e ("powerpc/pseries: Export raw per-CPU VPA data via debugfs") +Signed-off-by: YueHaibing +Reviewed-by: Daniel Axtens +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20190218125644.87448-1-yuehaibing@huawei.com +Acked-by: Michal Suchanek +--- + arch/powerpc/platforms/pseries/lpar.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c +index 74c59a1e9627..8c5af2cd95a7 100644 +--- a/arch/powerpc/platforms/pseries/lpar.c ++++ b/arch/powerpc/platforms/pseries/lpar.c +@@ -2000,7 +2000,7 @@ static int __init vpa_debugfs_init(void) + { + char name[16]; + long i; +- static struct dentry *vpa_dir; ++ struct dentry *vpa_dir; + + if (!firmware_has_feature(FW_FEATURE_SPLPAR)) + return 0; +-- +2.23.0 + diff --git a/series.conf b/series.conf index a96036c..6539a2f 100644 --- a/series.conf +++ b/series.conf @@ -51662,6 +51662,7 @@ patches.suse/powerpc-pseries-safely-roll-back-failed-DLPAR-cpu-ad.patch patches.suse/powerpc-security-book3s64-Report-L1TF-status-in-sysf.patch patches.suse/powerpc-security-Fix-wrong-message-when-RFI-Flush-is.patch + patches.suse/powerpc-pseries-Drop-pointless-static-qualifier-in-v.patch patches.suse/powerpc-xive-Prevent-page-fault-issues-in-the-machin.patch patches.suse/powerpc-fadump-when-fadump-is-supported-register-the.patch patches.suse/powerpc-powernv-Disable-native-PCIe-port-management.patch