64c64
< CONFIG_M486=y
---
> # CONFIG_M486 is not set
72c72
< # CONFIG_MPENTIUM4 is not set
---
> CONFIG_MPENTIUM4=y
85c85
< CONFIG_X86_L1_CACHE_SHIFT=4
---
> CONFIG_X86_L1_CACHE_SHIFT=7
87,88d86
< CONFIG_X86_PPRO_FENCE=y
< CONFIG_X86_F00F_BUG=y
93a92,94
> CONFIG_X86_GOOD_APIC=y
> CONFIG_X86_INTEL_USERCOPY=y
> CONFIG_X86_USE_PPRO_CHECKSUM=y
101a103
> CONFIG_X86_TSC=y
103,104c105,106
< # CONFIG_X86_MCE_NONFATAL is not set
< # CONFIG_X86_MCE_P4THERMAL is not set
---
> CONFIG_X86_MCE_NONFATAL=y
> CONFIG_X86_MCE_P4THERMAL=y
2321a2324
> # CONFIG_PAX_PAGEEXEC is not set
2330a2334
> # CONFIG_PAX_RANDKSTACK is not set