From 39c79448037f3258a24760a8b012e96b8130ceee Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 22 Jan 2007 11:08:30 +0000 Subject: [PATCH] * Build an SMP kernel. svn path=/nixpkgs/trunk/; revision=7738 --- ....19.1-i686-up => config-2.6.19.1-i686-smp} | 82 ++++++------------- .../os-specific/linux/kernel/linux-2.6.19.nix | 2 +- 2 files changed, 28 insertions(+), 56 deletions(-) rename pkgs/os-specific/linux/kernel/{config-2.6.19.1-i686-up => config-2.6.19.1-i686-smp} (98%) diff --git a/pkgs/os-specific/linux/kernel/config-2.6.19.1-i686-up b/pkgs/os-specific/linux/kernel/config-2.6.19.1-i686-smp similarity index 98% rename from pkgs/os-specific/linux/kernel/config-2.6.19.1-i686-up rename to pkgs/os-specific/linux/kernel/config-2.6.19.1-i686-smp index 8adaa4b1c320..c2ef369198dc 100644 --- a/pkgs/os-specific/linux/kernel/config-2.6.19.1-i686-up +++ b/pkgs/os-specific/linux/kernel/config-2.6.19.1-i686-smp @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.19.1 -# Mon Jan 1 02:56:26 2007 +# Linux kernel version: 2.6.19.2 +# Mon Jan 22 12:03:13 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -21,7 +21,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 # @@ -41,7 +41,8 @@ CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -# CONFIG_RELAY is not set +# CONFIG_CPUSETS is not set +CONFIG_RELAY=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y @@ -75,6 +76,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y +CONFIG_STOP_MACHINE=y # # Block layer @@ -100,7 +102,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" # # Processor type and features # -# CONFIG_SMP is not set +CONFIG_SMP=y CONFIG_X86_PC=y # CONFIG_X86_ELAN is not set # CONFIG_X86_VOYAGER is not set @@ -148,16 +150,19 @@ CONFIG_X86_GOOD_APIC=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_TSC=y -# CONFIG_HPET_TIMER is not set -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_NR_CPUS=8 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # 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 -# CONFIG_X86_MCE_NONFATAL is not set +CONFIG_X86_MCE_NONFATAL=y CONFIG_X86_MCE_P4THERMAL=y CONFIG_VM86=y CONFIG_TOSHIBA=m @@ -180,8 +185,6 @@ CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y -CONFIG_PROC_MM=y -# CONFIG_PROC_MM_DUMPABLE is not set CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -199,6 +202,7 @@ CONFIG_HIGHPTE=y # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y CONFIG_EFI=y +CONFIG_IRQBALANCE=y CONFIG_BOOT_IOREMAP=y CONFIG_REGPARM=y CONFIG_SECCOMP=y @@ -209,6 +213,7 @@ CONFIG_HZ=250 CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x100000 +CONFIG_HOTPLUG_CPU=y CONFIG_COMPAT_VDSO=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y @@ -221,6 +226,7 @@ CONFIG_PM_LEGACY=y # CONFIG_PM_SYSFS_DEPRECATED is not set CONFIG_SOFTWARE_SUSPEND=y CONFIG_PM_STD_PARTITION="" +CONFIG_SUSPEND_SMP=y # # ACPI (Advanced Configuration and Power Interface) Support @@ -228,7 +234,7 @@ CONFIG_PM_STD_PARTITION="" CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_SLEEP_PROC_FS=y -CONFIG_ACPI_SLEEP_PROC_SLEEP=y +# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BUTTON=m @@ -237,6 +243,7 @@ CONFIG_ACPI_VIDEO=m CONFIG_ACPI_FAN=m CONFIG_ACPI_DOCK=m CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=m CONFIG_ACPI_ASUS=m CONFIG_ACPI_IBM=m @@ -770,7 +777,6 @@ CONFIG_ROSE=m CONFIG_MKISS=m CONFIG_6PACK=m CONFIG_BPQETHER=m -CONFIG_DMASCC=m CONFIG_SCC=m CONFIG_SCC_DELAY=y CONFIG_SCC_TRXECHO=y @@ -823,12 +829,10 @@ CONFIG_ACT200L_DONGLE=m # # Old SIR device drivers # -CONFIG_IRPORT_SIR=m # # Old Serial dongle support # -# CONFIG_DONGLE_OLD is not set # # FIR device drivers @@ -896,7 +900,7 @@ CONFIG_FW_LOADER=m # # Connector - unified userspace <-> kernelspace linker # -# CONFIG_CONNECTOR is not set +CONFIG_CONNECTOR=m # # Memory Technology Devices (MTD) @@ -1394,13 +1398,10 @@ CONFIG_PATA_WINBOND=m CONFIG_CD_NO_IDESCSI=y CONFIG_AZTCD=m CONFIG_GSCD=m -# CONFIG_SBPCD is not set CONFIG_MCDX=m CONFIG_OPTCD=m -CONFIG_CM206=m CONFIG_SJCD=m # CONFIG_ISP16_CDI is not set -CONFIG_CDU31A=m CONFIG_CDU535=m # @@ -1545,7 +1546,6 @@ CONFIG_WD80x3=m CONFIG_ULTRA=m CONFIG_SMC9194=m CONFIG_NET_VENDOR_RACAL=y -CONFIG_NI5010=m CONFIG_NI52=m CONFIG_NI65=m @@ -1564,7 +1564,6 @@ CONFIG_WINBOND_840=m CONFIG_DM9102=m CONFIG_ULI526X=m CONFIG_PCMCIA_XIRCOM=m -CONFIG_PCMCIA_XIRTULIP=m CONFIG_AT1700=m CONFIG_DEPCA=m CONFIG_HP100=m @@ -1866,7 +1865,6 @@ CONFIG_ISDN_X25=y # # ISDN feature submodules # -# CONFIG_ISDN_DRV_LOOP is not set CONFIG_ISDN_DIVERSION=m # @@ -1947,8 +1945,6 @@ CONFIG_ISDN_DRV_ICN=m CONFIG_ISDN_DRV_PCBIT=m CONFIG_ISDN_DRV_SC=m CONFIG_ISDN_DRV_ACT2000=m -CONFIG_HYSDN=m -# CONFIG_HYSDN_CAPI is not set # # Siemens Gigaset @@ -2116,14 +2112,11 @@ CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m CONFIG_SYNCLINK_GT=m CONFIG_N_HDLC=m -# CONFIG_RISCOM8 is not set # CONFIG_SPECIALIX is not set CONFIG_SX=m CONFIG_RIO=m CONFIG_RIO_OLDPCI=y CONFIG_STALDRV=y -CONFIG_STALLION=m -CONFIG_ISTALLION=m # # Serial drivers @@ -2239,31 +2232,6 @@ CONFIG_SONYPI=m # # Ftape, the floppy tape device driver # -CONFIG_FTAPE=m -CONFIG_ZFTAPE=m -CONFIG_ZFT_DFLT_BLK_SZ=10240 - -# -# The compressor will be built as a module only! -# -CONFIG_ZFT_COMPRESSOR=m -CONFIG_FT_NR_BUFFERS=3 -CONFIG_FT_PROC_FS=y -CONFIG_FT_NORMAL_DEBUG=y -# CONFIG_FT_FULL_DEBUG is not set -# CONFIG_FT_NO_TRACE is not set -# CONFIG_FT_NO_TRACE_AT_ALL is not set - -# -# Hardware configuration -# -CONFIG_FT_STD_FDC=y -# CONFIG_FT_MACH2 is not set -# CONFIG_FT_PROBE_FC10 is not set -# CONFIG_FT_ALT_FDC is not set -CONFIG_FT_FDC_THR=8 -CONFIG_FT_FDC_MAX_RATE=2000 -CONFIG_FT_ALPHA_CLOCK=0 CONFIG_AGP=m CONFIG_AGP_ALI=m CONFIG_AGP_ATI=m @@ -2337,7 +2305,6 @@ CONFIG_I2C_ALI15X3=m CONFIG_I2C_AMD756=m CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m -CONFIG_I2C_ELEKTOR=m CONFIG_I2C_I801=m CONFIG_I2C_I810=m CONFIG_I2C_PIIX4=m @@ -2397,6 +2364,7 @@ CONFIG_SPI_MASTER=y # Dallas's 1-wire bus # CONFIG_W1=m +CONFIG_W1_CON=y # # 1-wire Bus Masters @@ -3722,5 +3690,9 @@ CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=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 diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.19.nix b/pkgs/os-specific/linux/kernel/linux-2.6.19.nix index c78260433b2e..51a0d452d3a3 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.19.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { patches = map (p: p.patch) kernelPatches; - config = ./config-2.6.19.1-i686-up; + config = ./config-2.6.19.1-i686-smp; buildInputs = [perl mktemp]; arch="i386";