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 <digit@android.com>

diff --git a/arch/x86/configs/i386_emu_defconfig b/arch/x86/configs/i386_emu_defconfig
index dd45fd807aceac060a68e95d40fc710478b837bf..084af64360bcbc51f268ce250b7651bc6cd991af 100644 (file)
--- 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 28e0fa2bf53bde9f6936efff4b2e1f286d368401..f79001508e218daa40afc24e93806129ca9c58af 100644 (file)
--- 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