Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-07-27 12:35:04 +0200
committerMichal Suchanek <msuchanek@suse.de>2019-07-27 12:35:04 +0200
commit2f51d2187e9b233158f7f75bd804bfc2b59d5ab8 (patch)
tree67aa2f5930877676a58da356df54a616c914a7d8
parente26ced241636e846947ac7d1164d93d550ae984e (diff)
Update config files.
-rw-r--r--config/arm64/vanilla7
-rw-r--r--config/armv7hl/vanilla4
-rw-r--r--config/i386/vanilla2
-rw-r--r--config/ppc64/vanilla5
-rw-r--r--config/ppc64le/vanilla14
-rw-r--r--config/x86_64/vanilla2
6 files changed, 24 insertions, 10 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index bda9ebe6c5..182d85caaa 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -4,7 +4,7 @@
#
#
-# Compiler: gcc-9 (SUSE Linux) 9.1.1 20190611 [gcc-9-branch revision 272147]
+# Compiler: aarch64-suse-linux-gcc (SUSE Linux) 9.1.1 20190718 [gcc-9-branch revision 273566]
#
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=90101
@@ -438,7 +438,8 @@ CONFIG_ARM64_DEBUG_PRIORITY_MASKING=y
CONFIG_RELOCATABLE=y
CONFIG_RANDOMIZE_BASE=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
-# CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG is not set
+CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
+CONFIG_STACKPROTECTOR_PER_TASK=y
# end of Kernel Features
#
@@ -758,7 +759,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/armv7hl/vanilla b/config/armv7hl/vanilla
index 6128a00ca1..be482c457c 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -4,7 +4,7 @@
#
#
-# Compiler: gcc-9 (SUSE Linux) 9.1.1 20190611 [gcc-9-branch revision 272147]
+# Compiler: arm-suse-linux-gnueabi-gcc (SUSE Linux) 9.1.1 20190718 [gcc-9-branch revision 273566]
#
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=90101
@@ -968,7 +968,7 @@ CONFIG_ARCH_WANT_IPC_PARSE_VERSION=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/i386/vanilla b/config/i386/vanilla
index 8750202b6a..1e7485868d 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -4,7 +4,7 @@
#
#
-# Compiler: gcc-9 (SUSE Linux) 9.1.1 20190611 [gcc-9-branch revision 272147]
+# Compiler: gcc (SUSE Linux) 9.1.1 20190718 [gcc-9-branch revision 273566]
#
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=90101
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 5e87e7dfb7..53369ab4a0 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -4,7 +4,7 @@
#
#
-# Compiler: gcc-9 (SUSE Linux) 9.1.1 20190611 [gcc-9-branch revision 272147]
+# Compiler: powerpc64-suse-linux-gcc (SUSE Linux) 9.1.1 20190718 [gcc-9-branch revision 273566]
#
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=90101
@@ -641,7 +641,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_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index f148616b2e..fc3154d1c7 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -4,7 +4,7 @@
#
#
-# Compiler: gcc-9 (SUSE Linux) 9.1.1 20190611 [gcc-9-branch revision 272147]
+# Compiler: powerpc64le-suse-linux-gcc (SUSE Linux) 9.1.1 20190718 [gcc-9-branch revision 273566]
#
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=90101
@@ -430,7 +430,7 @@ CONFIG_SCHED_HRTICK=y
CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
CONFIG_PPC_TRANSACTIONAL_MEM=y
# CONFIG_LD_HEAD_STUB_CATCH is not set
-# CONFIG_MPROFILE_KERNEL is not set
+CONFIG_MPROFILE_KERNEL=y
CONFIG_HOTPLUG_CPU=y
CONFIG_ARCH_CPU_PROBE_RELEASE=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -531,6 +531,8 @@ CONFIG_VHOST_SCSI=m
CONFIG_VHOST_VSOCK=m
CONFIG_VHOST=m
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+CONFIG_HAVE_LIVEPATCH=y
+CONFIG_LIVEPATCH=y
#
# General architecture-dependent options
@@ -544,6 +546,7 @@ CONFIG_KPROBES=y
CONFIG_JUMP_LABEL=y
# CONFIG_STATIC_KEYS_SELFTEST is not set
CONFIG_OPTPROBES=y
+CONFIG_KPROBES_ON_FTRACE=y
CONFIG_UPROBES=y
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
@@ -577,7 +580,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_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
@@ -7598,6 +7604,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
@@ -7627,11 +7634,13 @@ CONFIG_BRANCH_PROFILE_NONE=y
CONFIG_STACK_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
CONFIG_UPROBE_EVENTS=y
CONFIG_BPF_EVENTS=y
CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
CONFIG_FUNCTION_PROFILER=y
# CONFIG_BPF_KPROBE_OVERRIDE is not set
CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -7681,6 +7690,7 @@ CONFIG_TEST_SYSCTL=m
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_KMOD is not set
# CONFIG_TEST_MEMCAT_P is not set
+CONFIG_TEST_LIVEPATCH=m
# CONFIG_TEST_OBJAGG is not set
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_MEMINIT is not set
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index d9ed98fbe3..da68560334 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -4,7 +4,7 @@
#
#
-# Compiler: gcc-9 (SUSE Linux) 9.1.1 20190611 [gcc-9-branch revision 272147]
+# Compiler: gcc (SUSE Linux) 9.1.1 20190718 [gcc-9-branch revision 273566]
#
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=90101