- up to 4.1.43

[packages/kernel.git] / kernel-x86.config

diff --git a/kernel-x86.config b/kernel-x86.config
index e165a2ee03ad7674f42727a996dcb990adba461e..93055a16ec8aa22fca0e95c8fb8b2a0d8124eafb 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
 
 #-
@@ -29,7 +28,6 @@ X86_INTEL_MID i386=n
 X86_INTEL_QUARK i386=y
 X86_INTEL_LPSS all=y
 X86_RDC321X i386=n
-
 X86_32_NON_STANDARD i386=y
 STA2X11 all=y
 X86_32_IRIS i486=y i586=y i686=y
@@ -43,7 +41,6 @@ KVM_GUEST x86=y
 #- file arch/x86/lguest/Kconfig goes here
 PARAVIRT_TIME_ACCOUNTING x86=y
 NO_BOOTMEM x86=y
-MEMTEST x86=n
 #- file arch/x86/Kconfig.cpu goes here
 HPET_TIMER x86=y
 DMI x86=y
@@ -77,13 +74,13 @@ NOHIGHMEM i386=n
 HIGHMEM4G i386=y
 HIGHMEM64G i386=n
 PAGE_OFFSET i386=0xC0000000
-DIRECT_GBPAGES x86=y
 NUMA x86_64=y
 AMD_NUMA x86=n
 X86_64_ACPI_NUMA x86_64=y
 NUMA_EMU x86_64=n
 NODES_SHIFT x86_64=6
 #- file mm/Kconfig goes here
+X86_PMEM_LEGACY x86=y
 HIGHPTE i386=n
 X86_CHECK_BIOS_CORRUPTION x86=y
 X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK x86=y
@@ -105,12 +102,13 @@ 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 x86=0x1000000
 HOTPLUG_CPU x86=y
 BOOTPARAM_HOTPLUG_CPU0 all=n
 DEBUG_HOTPLUG_CPU0 all=n
 COMPAT_VDSO x86=n
 CMDLINE_BOOL x86=n
+#- file kernel/livepatch/Kconfig goes here
 #- file kernel/power/Kconfig goes here
 #- file drivers/acpi/Kconfig goes here
 #- file drivers/sfi/Kconfig goes here
@@ -284,15 +282,7 @@ X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
 #-
 #- *** FILE: drivers/gpio/Kconfig ***
 #-
-#- Memory mapped GPIO drivers:
 GPIO_STA2X11 all=y
-#- I2C GPIO expanders:
-#- PCI GPIO expanders:
-#- SPI GPIO expanders:
-#- AC97 GPIO expanders:
-#- LPC GPIO expanders:
-#- MODULbus GPIO expanders:
-#- USB GPIO expanders:
 
 #-
 #- *** FILE: drivers/iommu/Kconfig ***
@@ -364,7 +354,14 @@ DEBUG_STACK_USAGE x86=n
 DEBUG_PER_CPU_MAPS x86=n
 DEBUG_STACKOVERFLOW x86=n
 #- file lib/Kconfig.kmemcheck goes here
+#- file lib/Kconfig.kasan goes here
 DEBUG_STRICT_USER_COPY_CHECKS x86=n
 #- file kernel/trace/Kconfig goes here
+MEMTEST x86=n
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
+
+#-
+#- *** PROBABLY REMOVED OPTIONS ***
+#-
+DIRECT_GBPAGES x86=y