From eb8c84009cfbe3a2cc7bc239fddd6fc1f30ed4af Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Thu, 2 Jan 2020 10:26:47 +0000 Subject: [PATCH] main/linux-lts: fix config for ppc64le there was new config knobs. enable stackprotector --- main/linux-lts/APKBUILD | 2 +- main/linux-lts/config-lts.ppc64le | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD index a8fc5866c93f..fa498314e860 100644 --- a/main/linux-lts/APKBUILD +++ b/main/linux-lts/APKBUILD @@ -224,8 +224,8 @@ e44718f77a5817daf155d5ba1cab5a2ab1afce485e42164637254d320fadc28a8122f206e57d33e8 e4840371da27c28a67febbf6a91921098b0b55dfbf276bc744dc0fec93a7ba627f33e070f4a80156a07018002ff59ad00e67dfe2066511bccd33f1b34f718d42 config-lts.armv7 51d6512906def6c75147658c22513469089cfb1d65a095cff0d3630810920dbdf33d022ede131ba91536de4b71550acebe9666e4e94a0a9909f1c9a7223551e4 config-lts.x86 ace6e5f807ab94a54b3eaeff45d6745a89d42480efb3d169a1183f2b20398e91964d0400327264f1fdfa0a58a5210b197115126100c526b512e138a46cba8ddf config-lts.x86_64 -e17b5a02abd13f68d3c903fcffa24cf3e4042c312249eb846fe82daa93ad193c3d13e9002be658028c0d64ea6d6ee1919f058fcfe6ca16607f2da0544ad34ccc config-lts.ppc64le 113abc4713314defe00d05ecd509db2d0cc53ca105ab4a9ab4d4fa16da8a39edb68d6c1c63b377f5bfa7610c686fe0017798fa70a5f9435afb215888c9be52bc config-lts.s390x +dc5391cdd2301717a2286d3a3c8582cde401e937f162201a2f70d2ce8c6c2b7da8b3e7ddb5146eeb9bf3bf40d64d7fa1297cc9475915ee02d68b14bfbb21902a config-lts.ppc64le 8f13fd5e2a30b98a4718f75221d6fe13c434cbcde432ad1aab0a8bf85937ee0038f5735ba741a670b94ec680fbce4728eeaf8935af4dd6b14722338446903288 config-virt.aarch64 d948391ff437a030ce30f795983748f9eb876b0405d3ef6728590a69adc2a77c9182d39477854be268458d583b8bc34c48fec8bd38502f57f3d02b49c3c9bb36 config-virt.x86 0926abbfeffb4bd532cdfd941cd771460fa0bb9f7a7612bac171a6448fccaa094c5ee9fcfe075076f3bd53b0c437d766e699bb96258cf2f80c40fe0c8d66dd94 config-virt.x86_64 diff --git a/main/linux-lts/config-lts.ppc64le b/main/linux-lts/config-lts.ppc64le index 814cb96ff2b2..dea1bd6a2bc1 100644 --- a/main/linux-lts/config-lts.ppc64le +++ b/main/linux-lts/config-lts.ppc64le @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.4.5 Kernel Configuration +# Linux/powerpc 5.4.7 Kernel Configuration # # @@ -403,6 +403,7 @@ CONFIG_HZ=100 CONFIG_SCHED_HRTICK=y CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y CONFIG_PPC_TRANSACTIONAL_MEM=y +CONFIG_MPROFILE_KERNEL=y CONFIG_HOTPLUG_CPU=y CONFIG_ARCH_CPU_PROBE_RELEASE=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y @@ -490,6 +491,7 @@ CONFIG_KVM_XIVE=y CONFIG_VHOST_NET=m CONFIG_VHOST=m # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set +CONFIG_HAVE_LIVEPATCH=y # # General architecture-dependent options @@ -536,7 +538,10 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_STACKPROTECTOR=y CONFIG_CC_HAS_STACKPROTECTOR_NONE=y +CONFIG_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR_STRONG=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y CONFIG_ARCH_HAS_SCALED_CPUTIME=y @@ -4502,6 +4507,7 @@ CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y -- GitLab