From: Marc Fiuczynski Date: Mon, 10 Sep 2007 18:50:30 +0000 (+0000) Subject: # Enable SMP by default... the world is going multicore and so are we.. X-Git-Tag: linux-2.6-22-1~26 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=35217cab648ce809a461c93940ce15dc2e13b9f5;p=linux-2.6.git # Enable SMP by default... the world is going multicore and so are we.. REMOVED -> BUILTIN : CONFIG_BROKEN_ON_SMP BUILTIN -> DISABLE : CONFIG_SMP 16 -> REMOVED : CONFIG_NR_CPUS DISABLE -> BUILTIN : CONFIG_X86_PC BUILTIN -> DISABLE : CONFIG_X86_GENERICARCH REMOVED -> BUILTIN : CONFIG_X86_UP_APIC REMOVED -> BUILTIN : CONFIG_X86_UP_IOAPIC REMOVED -> BUILTIN : CONFIG_ARCH_FLATMEM_ENABLE REMOVED -> BUILTIN : CONFIG_ARCH_SPARSEMEM_ENABLE REMOVED -> BUILTIN : CONFIG_ARCH_SELECT_MEMORY_MODEL DISABLE -> BUILTIN : CONFIG_SPARSEMEM_STATIC BUILTIN -> REMOVED : CONFIG_SCHED_SMT BUILTIN -> REMOVED : CONFIG_SCHED_MC BUILTIN -> REMOVED : CONFIG_PREEMPT_BKL BUILTIN -> REMOVED : CONFIG_GENERIC_PENDING_IRQ BUILTIN -> REMOVED : CONFIG_X86_SMP BUILTIN -> REMOVED : CONFIG_X86_HT BUILTIN -> REMOVED : CONFIG_X86_TRAMPOLINE # expose some x86 registeres as /dev char devices MODULE -> DISABLE : CONFIG_X86_MSR MODULE -> DISABLE : CONFIG_X86_CPUID # Don't include Video for Linux DISABLE -> MODULE : CONFIG_VIDEO_DEV REMOVED -> BUILTIN : CONFIG_VIDEO_V4L2 REMOVED -> BUILTIN : CONFIG_VIDEO_HELPER_CHIPS_AUTO # Disable mutex and vm debuging DISABLE -> BUILTIN : CONFIG_DEBUG_MUTEXES DISABLE -> BUILTIN : CONFIG_DEBUG_VM # Enable list debugging BUILTIN -> DISABLE : CONFIG_DEBUG_LIST # Enable KVM support... just too cool not to use it on VT/Pacfica enabled systems MODULE -> REMOVED : CONFIG_KVM MODULE -> REMOVED : CONFIG_KVM_INTEL MODULE -> REMOVED : CONFIG_KVM_AMD # mirror settings from FC MODULE -> DISABLE : CONFIG_EDD BUILTIN -> MODULE : CONFIG_EFI_VARS BUILTIN -> DISABLE : CONFIG_RESOURCES_64BIT DISABLE -> BUILTIN : CONFIG_SCSI_SAS_LIBSAS_DEBUG BUILTIN -> DISABLE : CONFIG_RTC REMOVED -> DISABLE : CONFIG_GEN_RTC BUILTIN -> DISABLE : CONFIG_HPET BUILTIN -> REMOVED : CONFIG_HPET_MMAP BUILTIN -> REMOVED : CONFIG_HPET_EMULATE_RTC BUILTIN -> REMOVED : CONFIG_X86_CYCLONE_TIMER MODULE -> DISABLE : CONFIG_HWMON BUILTIN -> REMOVED : CONFIG_LOCK_KERNEL BUILTIN -> REMOVED : CONFIG_STOP_MACHINE BUILTIN -> DISABLE : CONFIG_KALLSYMS_ALL DISABLE -> BUILTIN : CONFIG_IKCONFIG REMOVED -> BUILTIN : CONFIG_IKCONFIG_PROC DISABLE -> BUILTIN : CONFIG_SYSFS_DEPRECATED --- diff --git a/configs/kernel-2.6.20-i686-planetlab.config b/configs/kernel-2.6.20-i686-planetlab.config index 45a6f13fa..1531ce2d9 100644 --- a/configs/kernel-2.6.20-i686-planetlab.config +++ b/configs/kernel-2.6.20-i686-planetlab.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.20-1.2949.fc6.vs2.2.0.1 -# Tue Jul 3 15:17:57 2007 +# Mon Sep 10 14:30:09 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -22,7 +22,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # Code maturity level options # CONFIG_EXPERIMENTAL=y -CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 # @@ -39,10 +39,10 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_TASKSTATS is not set CONFIG_UTS_NS=y # CONFIG_AUDIT is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y +# CONFIG_IKCONFIG is not set CONFIG_OOM_PANIC=y -CONFIG_SYSFS_DEPRECATED=y +# CONFIG_CPUSETS is not set +# CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -51,7 +51,7 @@ CONFIG_SYSCTL=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -79,6 +79,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_VERIFY_ELF is not set # CONFIG_MODULE_SIG is not set CONFIG_KMOD=y +CONFIG_STOP_MACHINE=y # # Process debugging support @@ -110,8 +111,8 @@ CONFIG_DEFAULT_IOSCHED="cfq" # # Processor type and features # -# CONFIG_SMP is not set -CONFIG_X86_PC=y +CONFIG_SMP=y +# CONFIG_X86_PC is not set # CONFIG_X86_XEN is not set # CONFIG_X86_ELAN is not set # CONFIG_X86_VOYAGER is not set @@ -119,9 +120,10 @@ CONFIG_X86_PC=y # CONFIG_X86_SUMMIT is not set # CONFIG_X86_BIGSMP is not set # CONFIG_X86_VISWS is not set -# CONFIG_X86_GENERICARCH is not set +CONFIG_X86_GENERICARCH=y # CONFIG_X86_ES7000 is not set # CONFIG_PARAVIRT is not set +CONFIG_X86_CYCLONE_TIMER=y # CONFIG_M386 is not set # CONFIG_M486 is not set # CONFIG_M586 is not set @@ -164,11 +166,14 @@ CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_TSC=y CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_NR_CPUS=16 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set -CONFIG_X86_UP_APIC=y -CONFIG_X86_UP_IOAPIC=y +CONFIG_PREEMPT_BKL=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_MCE=y @@ -179,15 +184,15 @@ CONFIG_VM86=y # CONFIG_I8K is not set # CONFIG_X86_REBOOTFIXUPS is not set # CONFIG_MICROCODE is not set -# CONFIG_X86_MSR is not set -# CONFIG_X86_CPUID is not set +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m # CONFIG_SWIOTLB is not set # # Firmware Drivers # -# CONFIG_EDD is not set -CONFIG_EFI_VARS=m +CONFIG_EDD=m +CONFIG_EFI_VARS=y # CONFIG_DELL_RBU is not set # CONFIG_DCDBAS is not set # CONFIG_NOHIGHMEM is not set @@ -195,9 +200,6 @@ CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y -CONFIG_ARCH_FLATMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -205,13 +207,14 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_SPARSEMEM_STATIC=y +# CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_RESOURCES_64BIT is not set +CONFIG_RESOURCES_64BIT=y CONFIG_HIGHPTE=y # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y CONFIG_EFI=y +# CONFIG_IRQBALANCE is not set CONFIG_BOOT_IOREMAP=y # CONFIG_SECCOMP is not set # CONFIG_HZ_100 is not set @@ -224,6 +227,7 @@ CONFIG_CRASH_DUMP=y CONFIG_PHYSICAL_START=0x100000 # CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x100000 +# CONFIG_HOTPLUG_CPU is not set # CONFIG_COMPAT_VDSO is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y @@ -234,13 +238,11 @@ CONFIG_PM=y CONFIG_PM_LEGACY=y # CONFIG_PM_DEBUG is not set # CONFIG_PM_SYSFS_DEPRECATED is not set -# CONFIG_SOFTWARE_SUSPEND is not set # # ACPI (Advanced Configuration and Power Interface) Support # CONFIG_ACPI=y -# CONFIG_ACPI_SLEEP is not set # CONFIG_ACPI_AC is not set # CONFIG_ACPI_BATTERY is not set # CONFIG_ACPI_BUTTON is not set @@ -757,7 +759,7 @@ CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m -CONFIG_SCSI_SAS_LIBSAS_DEBUG=y +# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set # # SCSI low-level drivers @@ -1228,8 +1230,7 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_GEODE=m CONFIG_HW_RANDOM_VIA=m # CONFIG_NVRAM is not set -# CONFIG_RTC is not set -# CONFIG_GEN_RTC is not set +CONFIG_RTC=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set @@ -1241,7 +1242,9 @@ CONFIG_HW_RANDOM_VIA=m # CONFIG_NSC_GPIO is not set # CONFIG_CS5535_GPIO is not set # CONFIG_RAW_DRIVER is not set -# CONFIG_HPET is not set +CONFIG_HPET=y +# CONFIG_HPET_RTC_IRQ is not set +CONFIG_HPET_MMAP=y CONFIG_HANGCHECK_TIMER=y # @@ -1318,48 +1321,58 @@ CONFIG_I2C_ALGOBIT=m # # Hardware Monitoring support # -# CONFIG_HWMON is not set +CONFIG_HWMON=m # CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_K8TEMP is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_SIS5595 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VIA686A is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_VT8231 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_SENSORS_HDAPS is not set +# CONFIG_HWMON_DEBUG_CHIP is not set # # Multimedia devices # -CONFIG_VIDEO_DEV=m -# CONFIG_VIDEO_V4L1 is not set -# CONFIG_VIDEO_V4L1_COMPAT is not set -CONFIG_VIDEO_V4L2=y - -# -# Video Capture Adapters -# - -# -# Video Capture Adapters -# -# CONFIG_VIDEO_ADV_DEBUG is not set -CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -# CONFIG_VIDEO_VIVI is not set -# CONFIG_VIDEO_SAA5246A is not set -# CONFIG_VIDEO_SAA5249 is not set -# CONFIG_VIDEO_SAA7134 is not set -# CONFIG_VIDEO_HEXIUM_ORION is not set -# CONFIG_VIDEO_HEXIUM_GEMINI is not set -# CONFIG_VIDEO_CX88 is not set -# CONFIG_VIDEO_CAFE_CCIC is not set - -# -# V4L USB devices -# -# CONFIG_VIDEO_PVRUSB2 is not set -# CONFIG_VIDEO_USBVISION is not set - -# -# Radio Adapters -# -# CONFIG_RADIO_GEMTEK_PCI is not set -# CONFIG_RADIO_MAXIRADIO is not set -# CONFIG_RADIO_MAESTRO is not set -# CONFIG_USB_DSBR is not set +# CONFIG_VIDEO_DEV is not set # # Digital Video Broadcasting Devices @@ -1599,7 +1612,9 @@ CONFIG_INTEL_IOATDMA=m # # Virtualization # -# CONFIG_KVM is not set +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m # # File systems @@ -1801,7 +1816,7 @@ CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_MUTEXES is not set # CONFIG_DEBUG_RWSEMS is not set # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set @@ -1811,8 +1826,8 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y CONFIG_DEBUG_HIGHMEM=y CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_VM=y -# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_VM is not set +CONFIG_DEBUG_LIST=y # CONFIG_FRAME_POINTER is not set # CONFIG_FORCED_INLINING is not set CONFIG_BOOT_DELAY=y @@ -1929,5 +1944,9 @@ CONFIG_PLIST=y CONFIG_IOMAP_COPY=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_X86_SMP=y +CONFIG_X86_HT=y CONFIG_X86_BIOS_REBOOT=y +CONFIG_X86_TRAMPOLINE=y CONFIG_KTIME_SCALAR=y