Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2018-05-29 16:54:31 -0400
committerJeff Mahoney <jeffm@suse.com>2018-05-29 17:04:44 -0400
commitbdf74e6caff1443c540764637cb098088d1f8480 (patch)
treef46c0a38847c67dedaab6f844cec91a35265e672
parent5c499a73954f783d6bd925efa76b3bfe5f18aad9 (diff)
rpm: fix typo, SUSE_KERNEL_RELEASE -> SUSE_KERNEL_RELEASED (bsc#1095104).rpm-4.12.14-23--SLE-15-Packages-GMC2rpm-4.12.14-23
This causes release kernels to report as (unreleased). suse-commit: cd0437b50ce3e319408b11c8f8ac03c83f375516
-rw-r--r--init/Kconfig.suse2
-rw-r--r--kernel/ksysfs.c2
-rw-r--r--kernel/printk/printk.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/init/Kconfig.suse b/init/Kconfig.suse
index 8fcbaf6788ec..45ba9c5aed0a 100644
--- a/init/Kconfig.suse
+++ b/init/Kconfig.suse
@@ -87,7 +87,7 @@ config SUSE_KERNEL_SUPPORTED
If you aren't building a kernel for an enterprise distribution,
say n.
-config SUSE_KERNEL_RELEASE
+config SUSE_KERNEL_RELEASED
bool "Release kernel"
default n
help
diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
index 7de8d6c9570b..f86831735bd4 100644
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
@@ -213,7 +213,7 @@ EXPORT_SYMBOL_GPL(kernel_kobj);
#ifdef CONFIG_SUSE_KERNEL_SUPPORTED
const char *supported_printable(int taint)
{
-#ifdef CONFIG_SUSE_KERNEL_RELEASE
+#ifdef CONFIG_SUSE_KERNEL_RELEASED
int mask = (1 << TAINT_PROPRIETARY_MODULE) | (1 << TAINT_NO_SUPPORT);
if ((taint & mask) == mask)
return "No, Proprietary and Unsupported modules are loaded";
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index add37c6f9d4b..69bdedb2ca38 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -3320,7 +3320,7 @@ void dump_stack_print_info(const char *log_lvl)
print_tainted(), init_utsname()->release,
(int)strcspn(init_utsname()->version, " "),
init_utsname()->version, SUSE_PRODUCT_SHORTNAME,
-#ifndef CONFIG_SUSE_KERNEL_RELEASE
+#ifndef CONFIG_SUSE_KERNEL_RELEASED
" (unreleased)"
#else
""