- update configs

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 791447fb5411145eafd710f87a0f78ee6f9c5a4a..16497315bb7c3843e08c09e7fed6ac8fd17dc94e 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -18,7 +18,6 @@ KEXEC_FILE all=y
 KEXEC_VERIFY_SIG all=n
 KVM_DEBUG_FS all=n
 KVM_DEVICE_ASSIGNMENT all=y
-PHYSICAL_ALIGN all=0x1000000
 PUNIT_ATOM_DEBUG all=m
 STATIC_KEYS_SELFTEST all=y
 X86_AMD_PLATFORM_DEVICE all=y

diff --git a/kernel-x86.config b/kernel-x86.config
index 7d2a9a2791a8bd77cee8fe3e39ac9757919c7ed7..46b28b42dcf4e732ac2edc271eb7ba76be283a7c 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -7,7 +7,6 @@ OPROFILE_EVENT_MULTIPLEX x86=y
 KPROBES x86=y
 JUMP_LABEL x86=y
 OPTPROBES x86=y
-CC_STACKPROTECTOR x86=y x86_64=y
 #- file kernel/gcov/Kconfig goes here
 
 #-
@@ -61,6 +60,7 @@ X86_MCE_INTEL all=y
 X86_MCE_AMD all=y
 X86_ANCIENT_MCE all=y
 X86_MCE_INJECT x86=m
+X86_LEGACY_VM86 i386=n
 VM86 i386=y
 X86_VSYSCALL_EMULATION x86=y
 TOSHIBA i386=m
@@ -103,7 +103,7 @@ KEXEC_JUMP x86=y
 PHYSICAL_START x86=0x1000000
 RELOCATABLE i386=y x86_64=y
 RANDOMIZE_BASE i386=y x86_64=y
-PHYSICAL_ALIGN i386=0x100000
+PHYSICAL_ALIGN i386=0x100000 x86_64=0x1000000
 HOTPLUG_CPU x86=y
 BOOTPARAM_HOTPLUG_CPU0 all=n
 DEBUG_HOTPLUG_CPU0 all=n
@@ -257,6 +257,7 @@ CRYPTO_SERPENT_SSE2_586 all=m
 #- Random Number Generation
 #- file drivers/crypto/Kconfig goes here
 #- file crypto/asymmetric_keys/Kconfig goes here
+#- file certs/Kconfig goes here
 
 #-
 #- *** FILE: drivers/cpufreq/Kconfig.x86 ***