[Nix-commits] SVN commit: nix - r33616 - nixpkgs/trunk/pkgs/os-specific/linux/kernel

[Eelco Dolstra]

Author: eelco
Date: Thu Apr  5 12:26:13 2012
New Revision: 33616
URL: https://nixos.org/websvn/nix/?rev=33616&sc=1

Log:
* Enable NUMA.  On our 48-core machines this cut the duration of a
  kernel build from 12m27s to 4m42s.

Modified:
   nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.2.nix
   nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.3.nix

Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.2.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.2.nix   Thu Apr  5 
12:24:08 2012        (r33615)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.2.nix   Thu Apr  5 
12:26:13 2012        (r33616)
@@ -37,10 +37,12 @@
       IOSCHED_CFQ y
       BLK_CGROUP y # required by CFQ
 
+      # Enable NUMA.
+      NUMA? y
+
       # Disable some expensive (?) features.
       FTRACE n
       KPROBES n
-      NUMA? n
       PM_TRACE_RTC n
 
       # Enable various subsystems.
@@ -226,7 +228,7 @@
 import ./generic.nix (
 
   rec {
-    version = "3.2.11";
+    version = "3.2.14";
     testing = false;
 
     modDirVersion = version;
@@ -236,8 +238,8 @@
     '';
 
     src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" 
else ""}linux-${version}.tar.bz2";
-      sha256 = "1hacfmf08ydzf4xlg6wkkckl5icj7w9h3nh17myz1s67bp7q61qs";
+      url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" 
else ""}linux-${version}.tar.xz";
+      sha256 = "032bv24wsab4c589svlq5ip8dcc4vihjcynq3ka18fgvxih251fm";
     };
 
     config = configWithPlatform stdenv.platform;

Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.3.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.3.nix   Thu Apr  5 
12:24:08 2012        (r33615)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.3.nix   Thu Apr  5 
12:26:13 2012        (r33616)
@@ -37,10 +37,12 @@
       IOSCHED_CFQ y
       BLK_CGROUP y # required by CFQ
 
+      # Enable NUMA.
+      NUMA? y
+
       # Disable some expensive (?) features.
       FTRACE n
       KPROBES n
-      NUMA? n
       PM_TRACE_RTC n
 
       # Enable various subsystems.
@@ -227,8 +229,6 @@
   rec {
     version = "3.3.1";
 
-    testing = false;
-
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
     '';
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits