17c17
< CONFIG_BROKEN_ON_SMP=y
---
> CONFIG_LOCK_KERNEL=y
35a36
> # CONFIG_CPUSETS is not set
59a61
> CONFIG_STOP_MACHINE=y
109,111c111,115
< # CONFIG_SMP is not set
< # CONFIG_PREEMPT_NONE is not set
< CONFIG_PREEMPT_VOLUNTARY=y
---
> CONFIG_SMP=y
> CONFIG_NR_CPUS=4
> CONFIG_SCHED_SMT=y
> CONFIG_PREEMPT_NONE=y
> # CONFIG_PREEMPT_VOLUNTARY is not set
113,114c117
< CONFIG_X86_UP_APIC=y
< CONFIG_X86_UP_IOAPIC=y
---
> CONFIG_PREEMPT_BKL=y
118,119c121,122
< # CONFIG_X86_MCE_NONFATAL is not set
< # CONFIG_X86_MCE_P4THERMAL is not set
---
> CONFIG_X86_MCE_NONFATAL=m
> CONFIG_X86_MCE_P4THERMAL=y
144a148,149
> CONFIG_IRQBALANCE=y
> CONFIG_HAVE_DEC_LOCK=y
168,170d172
< CONFIG_ACPI_SLEEP=y
< CONFIG_ACPI_SLEEP_PROC_FS=y
< # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
268a271
> # CONFIG_HOTPLUG_CPU is not set
617d619
< CONFIG_IRPORT_SIR=m
622,631d623
< CONFIG_DONGLE_OLD=y
< CONFIG_ESI_DONGLE_OLD=m
< CONFIG_ACTISYS_DONGLE_OLD=m
< CONFIG_TEKRAM_DONGLE_OLD=m
< CONFIG_GIRBIL_DONGLE_OLD=m
< CONFIG_LITELINK_DONGLE_OLD=m
< CONFIG_MCP2120_DONGLE_OLD=m
< CONFIG_OLD_BELKIN_DONGLE_OLD=m
< CONFIG_ACT200L_DONGLE_OLD=m
< CONFIG_MA600_DONGLE_OLD=m
1118d1109
< CONFIG_PCMCIA_XIRTULIP=m
1305d1295
< # CONFIG_ISDN_DRV_LOOP is not set
1386,1387d1375
< CONFIG_HYSDN=m
< CONFIG_HYSDN_CAPI=y
1615d1602
< # CONFIG_FTAPE is not set
1679d1665
< CONFIG_I2C_ELEKTOR=m
2387d2372
< CONFIG_USB_SERIAL_WHITEHEAT=m
2710c2695
< CONFIG_LOG_BUF_SHIFT=14
---
> CONFIG_LOG_BUF_SHIFT=15
2902a2888,2889
> CONFIG_X86_SMP=y
> CONFIG_X86_HT=y
2903a2891
> CONFIG_X86_TRAMPOLINE=y