From 43dbfdb838603e823d75cec871f0c317e8c20fc9 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Tue, 16 Sep 2014 22:12:31 +0200 Subject: [PATCH] goldfish: Disable Seccomp for Intel builds. For some reason, the kernel doesn't build if CONFIG_SECCOMP is enabled, which is the default for x86 and x86_64 builds. This patch disables the feature explicitly to work around this. BUG=17527409 Signed-off-by: David 'Digit' Turner --- arch/x86/configs/i386_emu_defconfig | 1 + arch/x86/configs/x86_64_emu_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/x86/configs/i386_emu_defconfig b/arch/x86/configs/i386_emu_defconfig index dd45fd807ac..084af64360b 100644 --- a/arch/x86/configs/i386_emu_defconfig +++ b/arch/x86/configs/i386_emu_defconfig @@ -40,6 +40,7 @@ CONFIG_X86_MSR=y CONFIG_X86_CPUID=y CONFIG_NOHIGHMEM=y # CONFIG_MTRR_SANITIZER is not set +# CONFIG_SECCOMP is not set CONFIG_HZ_100=y CONFIG_PHYSICAL_START=0x100000 # CONFIG_RELOCATABLE is not set diff --git a/arch/x86/configs/x86_64_emu_defconfig b/arch/x86/configs/x86_64_emu_defconfig index 28e0fa2bf53..f79001508e2 100644 --- a/arch/x86/configs/x86_64_emu_defconfig +++ b/arch/x86/configs/x86_64_emu_defconfig @@ -42,6 +42,7 @@ CONFIG_PREEMPT=y CONFIG_X86_MSR=y CONFIG_X86_CPUID=y # CONFIG_MTRR_SANITIZER is not set +# CONFIG_SECCOMP is not set CONFIG_HZ_100=y CONFIG_PHYSICAL_START=0x100000 # CONFIG_RELOCATABLE is not set -- 2.34.1