64c64
< CONFIG_M486=y
---
> # CONFIG_M486 is not set
74c74
< # CONFIG_MK7 is not set
---
> CONFIG_MK7=y
85c85
< CONFIG_X86_L1_CACHE_SHIFT=4
---
> CONFIG_X86_L1_CACHE_SHIFT=6
87,88d86
< CONFIG_X86_PPRO_FENCE=y
< CONFIG_X86_F00F_BUG=y
93a92,95
> CONFIG_X86_GOOD_APIC=y
> CONFIG_X86_INTEL_USERCOPY=y
> CONFIG_X86_USE_PPRO_CHECKSUM=y
> CONFIG_X86_USE_3DNOW=y
101a104
> CONFIG_X86_TSC=y
103c106
< # CONFIG_X86_MCE_NONFATAL is not set
---
> CONFIG_X86_MCE_NONFATAL=y
2321a2325
> # CONFIG_PAX_PAGEEXEC is not set
2330a2335
> # CONFIG_PAX_RANDKSTACK is not set