Home Home > GIT Browse > SLE12-SP5-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2019-09-03 13:02:15 +0200
committerMichal Kubecek <mkubecek@suse.cz>2019-09-03 13:02:15 +0200
commitccbe69a2e0a67d022443959ed8cec43160992c12 (patch)
tree7d61c2ac075ffdca2b94478bbdaa9164311cfcd7
parent4685373d5b214e85e838177b5f67dc69c775daf1 (diff)
parent4c43fabbd67ea0eed0469a7202c52c40cdb38870 (diff)
Merge branch 'master' into SLE15-SP2rpm-5.3.rc7-1--SLE-15-SP2-Packages-Alpha3rpm-5.3.rc7-1
-rw-r--r--config/arm64/default2
-rw-r--r--config/ppc64le/default2
-rw-r--r--config/x86_64/default2
3 files changed, 3 insertions, 3 deletions
diff --git a/config/arm64/default b/config/arm64/default
index ffe5280f77..684af11e1c 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -756,7 +756,7 @@ CONFIG_HAVE_ARCH_STACKLEAK=y
CONFIG_HAVE_STACKPROTECTOR=y
CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
CONFIG_STACKPROTECTOR=y
-# CONFIG_STACKPROTECTOR_STRONG is not set
+CONFIG_STACKPROTECTOR_STRONG=y
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
diff --git a/config/ppc64le/default b/config/ppc64le/default
index e776530556..82fbb2a294 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -579,7 +579,7 @@ CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_STACKPROTECTOR=y
CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
CONFIG_STACKPROTECTOR=y
-# CONFIG_STACKPROTECTOR_STRONG is not set
+CONFIG_STACKPROTECTOR_STRONG=y
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
diff --git a/config/x86_64/default b/config/x86_64/default
index 2218c1b9fd..e9ce6191e2 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -788,7 +788,7 @@ CONFIG_HAVE_ARCH_STACKLEAK=y
CONFIG_HAVE_STACKPROTECTOR=y
CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
CONFIG_STACKPROTECTOR=y
-# CONFIG_STACKPROTECTOR_STRONG is not set
+CONFIG_STACKPROTECTOR_STRONG=y
CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y