From be5fc98c97f9f82a28de36e792fd95b9b8e9d58c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 3 Aug 2009 09:25:57 +0000 Subject: [PATCH] Really non-PAE configuration this time svn path=/nixpkgs/trunk/; revision=16552 --- ...r => config-2.6.31-rc4-all-mod-i686-older} | 60 +++++++------------ .../linux/kernel/linux-2.6.31-rc2.nix | 2 +- .../linux/kernel/linux-2.6.31-rc3.nix | 2 +- .../linux/kernel/linux-2.6.31-rc4.nix | 2 +- 4 files changed, 24 insertions(+), 42 deletions(-) rename pkgs/os-specific/linux/kernel/{config-2.6.31-rc3-all-mod-i686-older => config-2.6.31-rc4-all-mod-i686-older} (99%) diff --git a/pkgs/os-specific/linux/kernel/config-2.6.31-rc3-all-mod-i686-older b/pkgs/os-specific/linux/kernel/config-2.6.31-rc4-all-mod-i686-older similarity index 99% rename from pkgs/os-specific/linux/kernel/config-2.6.31-rc3-all-mod-i686-older rename to pkgs/os-specific/linux/kernel/config-2.6.31-rc4-all-mod-i686-older index b29eb96b3c5..9c27fcdb799 100644 --- a/pkgs/os-specific/linux/kernel/config-2.6.31-rc3-all-mod-i686-older +++ b/pkgs/os-specific/linux/kernel/config-2.6.31-rc4-all-mod-i686-older @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.31-rc3 -# Tue Jul 14 13:08:00 2009 +# Mon Aug 3 13:28:05 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -225,16 +225,14 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SMP=y CONFIG_SPARSE_IRQ=y -CONFIG_NUMA_IRQ_DESC=y CONFIG_X86_MPPARSE=y -CONFIG_X86_BIGSMP=y +# CONFIG_X86_BIGSMP is not set CONFIG_X86_EXTENDED_PLATFORM=y CONFIG_X86_ELAN=y CONFIG_X86_RDC321X=y CONFIG_X86_32_NON_STANDARD=y -CONFIG_X86_NUMAQ=y +# CONFIG_X86_NUMAQ is not set CONFIG_X86_SUMMIT=y -CONFIG_X86_ES7000=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y CONFIG_VMI=y @@ -245,7 +243,6 @@ CONFIG_PARAVIRT=y CONFIG_PARAVIRT_SPINLOCKS=y CONFIG_PARAVIRT_CLOCK=y CONFIG_MEMTEST=y -CONFIG_X86_SUMMIT_NUMA=y CONFIG_X86_CYCLONE_TIMER=y CONFIG_X86_CPU=y CONFIG_X86_L1_CACHE_BYTES=64 @@ -258,7 +255,6 @@ CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y CONFIG_X86_ALIGNMENT_16=y -CONFIG_X86_CMPXCHG64=y CONFIG_X86_MINIMUM_CPU_FAMILY=4 CONFIG_X86_DEBUGCTLMSR=y CONFIG_PROCESSOR_SELECT=y @@ -274,11 +270,11 @@ CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y # CONFIG_IOMMU_HELPER is not set CONFIG_IOMMU_API=y -CONFIG_NR_CPUS=32 +CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y @@ -300,41 +296,34 @@ CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m # CONFIG_X86_CPU_DEBUG is not set -# CONFIG_NOHIGHMEM is not set +CONFIG_NOHIGHMEM=y # CONFIG_HIGHMEM4G is not set -CONFIG_HIGHMEM64G=y +# CONFIG_HIGHMEM64G is not set CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_3G_OPT is not set # CONFIG_VMSPLIT_2G is not set # CONFIG_VMSPLIT_2G_OPT is not set # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_HIGHMEM=y # CONFIG_X86_PAE is not set -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -CONFIG_NUMA=y -CONFIG_NODES_SHIFT=4 -CONFIG_HAVE_ARCH_BOOTMEM=y -CONFIG_ARCH_HAVE_MEMORY_PRESENT=y -CONFIG_NEED_NODE_MEMMAP_SIZE=y -CONFIG_HAVE_ARCH_ALLOC_REMAP=y -CONFIG_ARCH_DISCONTIGMEM_ENABLE=y -CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set + +# +# NUMA (Summit) requires SMP, 64GB highmem support, ACPI +# +CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_SELECT_MEMORY_MODEL=y -# CONFIG_FLATMEM_MANUAL is not set -CONFIG_DISCONTIGMEM_MANUAL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set # CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_DISCONTIGMEM=y +CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_NEED_MULTIPLE_NODES=y -CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_STATIC=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_MIGRATION=y -CONFIG_PHYS_ADDR_T_64BIT=y +# CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y @@ -342,7 +331,6 @@ CONFIG_HAVE_MLOCK=y CONFIG_HAVE_MLOCKED_PAGE_BIT=y CONFIG_MMU_NOTIFIER=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -CONFIG_HIGHPTE=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_RESERVE_LOW_64K=y @@ -363,7 +351,6 @@ CONFIG_HZ_250=y CONFIG_HZ=250 CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y -CONFIG_CRASH_DUMP=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y @@ -371,11 +358,7 @@ CONFIG_X86_NEED_RELOCS=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y CONFIG_COMPAT_VDSO=y -CONFIG_CMDLINE_BOOL=n -CONFIG_CMDLINE="" -CONFIG_CMDLINE_OVERRIDE=n -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -# CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID is not set +# CONFIG_CMDLINE_BOOL is not set # # Power management and ACPI options @@ -404,7 +387,6 @@ CONFIG_ACPI_DOCK=y CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=m -CONFIG_ACPI_NUMA=y # CONFIG_ACPI_CUSTOM_DSDT is not set CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set @@ -1759,7 +1741,6 @@ CONFIG_IEEE1394_DV1394=m CONFIG_I2O=m CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y CONFIG_I2O_EXT_ADAPTEC=y -CONFIG_I2O_EXT_ADAPTEC_DMA64=y CONFIG_I2O_CONFIG=m CONFIG_I2O_CONFIG_OLD_IOCTL=y CONFIG_I2O_BUS=m @@ -4115,6 +4096,7 @@ CONFIG_MMC_RICOH_MMC=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m +# CONFIG_MMC_SPI is not set CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m @@ -4267,6 +4249,7 @@ CONFIG_RTC_DRV_PCF50633=m # # on-CPU RTC drivers # +# CONFIG_DMADEVICES is not set CONFIG_AUXDISPLAY=y CONFIG_UIO=m CONFIG_UIO_CIF=m @@ -4428,7 +4411,6 @@ CONFIG_NTFS_RW=y # CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y -CONFIG_PROC_VMCORE=y CONFIG_PROC_SYSCTL=y CONFIG_PROC_PAGE_MONITOR=y CONFIG_SYSFS=y diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.31-rc2.nix b/pkgs/os-specific/linux/kernel/linux-2.6.31-rc2.nix index 86ea8bacdc7..9eb350d4af4 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.31-rc2.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.31-rc2.nix @@ -21,7 +21,7 @@ import ./generic.nix ( }; config = - if stdenv.system == "i686-linux" then if oldI686 then ./config-2.6.31-rc3-all-mod-i686-older else + if stdenv.system == "i686-linux" then if oldI686 then ./config-2.6.31-rc4-all-mod-i686-older else ./config-2.6.31-rc3-all-mod-i686 else if stdenv.system == "x86_64-linux" then ./config-2.6.31-rc3-all-mod-amd64 else abort "No kernel configuration for your platform!"; diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.31-rc3.nix b/pkgs/os-specific/linux/kernel/linux-2.6.31-rc3.nix index 65c519e477a..c523f276230 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.31-rc3.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.31-rc3.nix @@ -21,7 +21,7 @@ import ./generic.nix ( }; config = - if stdenv.system == "i686-linux" then if oldI686 then ./config-2.6.31-rc3-all-mod-i686-older else + if stdenv.system == "i686-linux" then if oldI686 then ./config-2.6.31-rc4-all-mod-i686-older else ./config-2.6.31-rc3-all-mod-i686 else if stdenv.system == "x86_64-linux" then ./config-2.6.31-rc3-all-mod-amd64 else abort "No kernel configuration for your platform!"; diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.31-rc4.nix b/pkgs/os-specific/linux/kernel/linux-2.6.31-rc4.nix index 726682b9696..a5e76a24556 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.31-rc4.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.31-rc4.nix @@ -21,7 +21,7 @@ import ./generic.nix ( }; config = - if stdenv.system == "i686-linux" then if oldI686 then ./config-2.6.31-rc3-all-mod-i686-older else + if stdenv.system == "i686-linux" then if oldI686 then ./config-2.6.31-rc4-all-mod-i686-older else ./config-2.6.31-rc3-all-mod-i686 else if stdenv.system == "x86_64-linux" then ./config-2.6.31-rc3-all-mod-amd64 else abort "No kernel configuration for your platform!";