diff --git a/.config.nickolay-842 b/.config.nickolay-842 index d2501f9..c79d983 100644 --- a/.config.nickolay-842 +++ b/.config.nickolay-842 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.1-pf Kernel Configuration +# Linux/x86_64 3.6.2-pf Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -287,6 +287,7 @@ CONFIG_ZONE_DMA=y CONFIG_SMP=y CONFIG_X86_MPPARSE=y # CONFIG_X86_EXTENDED_PLATFORM is not set +CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_PARAVIRT_GUEST is not set CONFIG_NO_BOOTMEM=y @@ -329,7 +330,12 @@ CONFIG_PREEMPT_NONE=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set -# CONFIG_X86_MCE is not set +CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +# CONFIG_X86_MCE_AMD is not set +CONFIG_X86_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y # CONFIG_I8K is not set CONFIG_MICROCODE=m CONFIG_MICROCODE_INTEL=y @@ -370,6 +376,8 @@ CONFIG_KSM=y CONFIG_UKSM=y # CONFIG_KSM_LEGACY is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +# CONFIG_MEMORY_FAILURE is not set CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set @@ -389,9 +397,16 @@ CONFIG_ARCH_RANDOM=y CONFIG_SECCOMP=y # CONFIG_CC_STACKPROTECTOR is not set CONFIG_HZ_100=y -# CONFIG_HZ_250 is not set +# CONFIG_HZ_250_NODEFAULT is not set # CONFIG_HZ_300 is not set # CONFIG_HZ_1000 is not set +# CONFIG_HZ_1500 is not set +# CONFIG_HZ_2000 is not set +# CONFIG_HZ_3000 is not set +# CONFIG_HZ_4000 is not set +# CONFIG_HZ_5000 is not set +# CONFIG_HZ_7500 is not set +# CONFIG_HZ_10000 is not set CONFIG_HZ=100 CONFIG_SCHED_HRTICK=y # CONFIG_KEXEC is not set