From a177964b3acf59b4bbc773fb68c7e8578a6ffdfa Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 13 Feb 2009 14:37:21 +0000 Subject: disable SMP by default on x86 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14498 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/x86/config-2.6.27 | 18 ++++++------------ target/linux/x86/config-2.6.28 | 18 +++++------------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/target/linux/x86/config-2.6.27 b/target/linux/x86/config-2.6.27 index dd7596cb8c..d58011a301 100644 --- a/target/linux/x86/config-2.6.27 +++ b/target/linux/x86/config-2.6.27 @@ -90,6 +90,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_DELL_RBU is not set # CONFIG_DEPCA is not set CONFIG_DEVPORT=y +# CONFIG_DMASCC is not set CONFIG_DMI=y # CONFIG_DMIID is not set CONFIG_DNOTIFY=y @@ -126,8 +127,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y # CONFIG_GENERIC_GPIO is not set CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_ISA_DMA=y -# CONFIG_GENERIC_LOCKBREAK is not set CONFIG_GENERIC_PENDING_IRQ=y +# CONFIG_GENERIC_LOCKBREAK is not set # CONFIG_GENERIC_TIME_VSYSCALL is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_HAS_DMA=y @@ -149,7 +150,7 @@ CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_KVM=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_SETUP_PER_CPU_AREA=y +# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y CONFIG_HID=y CONFIG_HID_SUPPORT=y @@ -322,7 +323,6 @@ CONFIG_NET_VENDOR_3COM=y # CONFIG_NET_VENDOR_SMC is not set CONFIG_NF_CT_ACCT=y CONFIG_NOHIGHMEM=y -CONFIG_NR_CPUS=8 CONFIG_NSC_GPIO=m CONFIG_NVRAM=y # CONFIG_OLPC is not set @@ -372,9 +372,7 @@ CONFIG_SC1200_WDT=m # CONFIG_SC520_WDT is not set # CONFIG_SCC is not set # CONFIG_SCHED_HRTICK is not set -CONFIG_SCHED_MC=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y -CONFIG_SCHED_SMT=y CONFIG_SCSI_WAIT_SCAN=m CONFIG_SCx200=y CONFIG_SCx200HR_TIMER=y @@ -396,7 +394,7 @@ CONFIG_SERIO_LIBPS2=y # CONFIG_SERIO_PCIPS2 is not set # CONFIG_SERIO_RAW is not set CONFIG_SERIO_SERPORT=y -CONFIG_SMP=y +# CONFIG_SMP is not set # CONFIG_SMSC37B787_WDT is not set CONFIG_SND_ISA=y # CONFIG_SND_SC6000 is not set @@ -405,7 +403,6 @@ CONFIG_SOFT_WATCHDOG=m CONFIG_SPARSEMEM_STATIC=y # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set CONFIG_SSB_POSSIBLE=y -CONFIG_STOP_MACHINE=y CONFIG_STRICT_DEVMEM=y # CONFIG_SYSPROF_TRACER is not set CONFIG_SYSVIPC_SYSCTL=y @@ -425,7 +422,6 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_SUPPORT=y CONFIG_USB_UHCI_HCD=m # CONFIG_USER_NS is not set -CONFIG_USE_GENERIC_SMP_HELPERS=y # CONFIG_VGACON_SOFT_SCROLLBACK is not set # CONFIG_VGASTATE is not set CONFIG_VGA_CONSOLE=y @@ -445,7 +441,6 @@ CONFIG_VT_CONSOLE=y # CONFIG_WDT is not set CONFIG_X86=y CONFIG_X86_32=y -CONFIG_X86_32_SMP=y # CONFIG_X86_64 is not set CONFIG_X86_BIOS_REBOOT=y # CONFIG_X86_CMPXCHG is not set @@ -459,7 +454,6 @@ CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_GENERIC=y # CONFIG_X86_GENERICARCH is not set CONFIG_X86_GX_SUSPMOD=m -CONFIG_X86_HT=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_IO_APIC=y CONFIG_X86_L1_CACHE_SHIFT=7 @@ -482,12 +476,12 @@ CONFIG_X86_PPRO_FENCE=y # CONFIG_X86_RDC321X is not set # CONFIG_X86_REBOOTFIXUPS is not set CONFIG_X86_RESERVE_LOW_64K=y -CONFIG_X86_SMP=y # CONFIG_X86_SPEEDSTEP_CENTRINO is not set # CONFIG_X86_SPEEDSTEP_ICH is not set # CONFIG_X86_SPEEDSTEP_LIB is not set # CONFIG_X86_SPEEDSTEP_SMI is not set -CONFIG_X86_TRAMPOLINE=y +CONFIG_X86_UP_APIC=y +CONFIG_X86_UP_IOAPIC=y CONFIG_X86_VERBOSE_BOOTUP=y # CONFIG_X86_VOYAGER is not set # CONFIG_X86_VSMP is not set diff --git a/target/linux/x86/config-2.6.28 b/target/linux/x86/config-2.6.28 index d89e09cc49..ee9a74fc75 100644 --- a/target/linux/x86/config-2.6.28 +++ b/target/linux/x86/config-2.6.28 @@ -101,6 +101,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_DELL_RBU is not set # CONFIG_DEPCA is not set CONFIG_DEVPORT=y +# CONFIG_DMASCC is not set CONFIG_DMI=y # CONFIG_DMIID is not set CONFIG_DNOTIFY=y @@ -137,7 +138,6 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_PENDING_IRQ=y # CONFIG_GENERIC_TIME_VSYSCALL is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_HAS_DMA=y @@ -160,7 +160,7 @@ CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_KVM=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_SETUP_PER_CPU_AREA=y +# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y CONFIG_HID=y CONFIG_HID_A4TECH=m @@ -260,7 +260,6 @@ CONFIG_KTIME_SCALAR=y # CONFIG_LEDS_CLEVO_MAIL is not set CONFIG_LEDS_NET48XX=m # CONFIG_LEDS_WRAP is not set -CONFIG_LOCK_KERNEL=y # CONFIG_LOGIRUMBLEPAD2_FF is not set # CONFIG_LOGITECH_FF is not set CONFIG_M386=y @@ -363,7 +362,6 @@ CONFIG_NET_VENDOR_3COM=y CONFIG_NF_CT_ACCT=y CONFIG_NF_DEFRAG_IPV4=m CONFIG_NOHIGHMEM=y -CONFIG_NR_CPUS=8 CONFIG_NSC_GPIO=m CONFIG_NVRAM=y # CONFIG_OLPC is not set @@ -415,9 +413,7 @@ CONFIG_SC1200_WDT=m # CONFIG_SC520_WDT is not set # CONFIG_SCC is not set # CONFIG_SCHED_HRTICK is not set -CONFIG_SCHED_MC=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y -CONFIG_SCHED_SMT=y CONFIG_SCSI_WAIT_SCAN=m CONFIG_SCx200=y CONFIG_SCx200HR_TIMER=y @@ -444,7 +440,7 @@ CONFIG_SLUB=y CONFIG_SLUB_DEBUG=y # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set -CONFIG_SMP=y +# CONFIG_SMP is not set # CONFIG_SMSC37B787_WDT is not set CONFIG_SND_ISA=y # CONFIG_SND_SC6000 is not set @@ -454,7 +450,6 @@ CONFIG_SOFT_WATCHDOG=m CONFIG_SOUND_OSS_CORE=y CONFIG_SPARSEMEM_STATIC=y CONFIG_SSB_POSSIBLE=y -CONFIG_STOP_MACHINE=y CONFIG_STRICT_DEVMEM=y # CONFIG_SYSPROF_TRACER is not set CONFIG_SYSVIPC_SYSCTL=y @@ -473,7 +468,6 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_SUPPORT=y CONFIG_USB_UHCI_HCD=m # CONFIG_USER_NS is not set -CONFIG_USE_GENERIC_SMP_HELPERS=y # CONFIG_VGACON_SOFT_SCROLLBACK is not set # CONFIG_VGASTATE is not set CONFIG_VGA_CONSOLE=y @@ -493,7 +487,6 @@ CONFIG_VT_CONSOLE=y # CONFIG_WDT is not set CONFIG_X86=y CONFIG_X86_32=y -CONFIG_X86_32_SMP=y # CONFIG_X86_64 is not set CONFIG_X86_BIOS_REBOOT=y # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set @@ -508,7 +501,6 @@ CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_GENERIC=y # CONFIG_X86_GENERICARCH is not set CONFIG_X86_GX_SUSPMOD=m -CONFIG_X86_HT=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_IO_APIC=y CONFIG_X86_L1_CACHE_SHIFT=7 @@ -531,12 +523,12 @@ CONFIG_X86_PPRO_FENCE=y # CONFIG_X86_RDC321X is not set # CONFIG_X86_REBOOTFIXUPS is not set CONFIG_X86_RESERVE_LOW_64K=y -CONFIG_X86_SMP=y # CONFIG_X86_SPEEDSTEP_CENTRINO is not set # CONFIG_X86_SPEEDSTEP_ICH is not set # CONFIG_X86_SPEEDSTEP_LIB is not set # CONFIG_X86_SPEEDSTEP_SMI is not set -CONFIG_X86_TRAMPOLINE=y +CONFIG_X86_UP_APIC=y +CONFIG_X86_UP_IOAPIC=y CONFIG_X86_VERBOSE_BOOTUP=y # CONFIG_X86_VOYAGER is not set # CONFIG_X86_VSMP is not set -- cgit v1.2.3