summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/patches.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2010-10-26 13:08:51 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2010-10-26 13:08:51 +0000
commit85a0cd138584689b87669868dd49e8e3fd74d6f9 (patch)
tree32e9f71655a3b4e586e2bcc0c2fe7b023ef18ad1 /pkgs/os-specific/linux/kernel/patches.nix
parent2cc3847cd4661efe9c0ddb872d13dae0f4bb8d4d (diff)
downloadnixpkgs-85a0cd138584689b87669868dd49e8e3fd74d6f9.tar
nixpkgs-85a0cd138584689b87669868dd49e8e3fd74d6f9.tar.gz
nixpkgs-85a0cd138584689b87669868dd49e8e3fd74d6f9.tar.bz2
nixpkgs-85a0cd138584689b87669868dd49e8e3fd74d6f9.tar.lz
nixpkgs-85a0cd138584689b87669868dd49e8e3fd74d6f9.tar.xz
nixpkgs-85a0cd138584689b87669868dd49e8e3fd74d6f9.tar.zst
nixpkgs-85a0cd138584689b87669868dd49e8e3fd74d6f9.zip
* A better fix for the Xen clock problem.
svn path=/nixpkgs/trunk/; revision=24488
Diffstat (limited to 'pkgs/os-specific/linux/kernel/patches.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index cdc67b9a3d5..19c7f06b8f7 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -214,9 +214,10 @@ in
       patch = ./guruplug-mach-type.patch;
     };
 
-  revert_pvclock_sync =
-    { name = "revert-pvclock-sync";
-      patch = ./revert-pvclock-sync.patch;
+  xen_pvclock_resume =
+    { # Fix the clock after a DomU restore following a Dom0 reboot or migration.
+      name = "xen-pvclock-resume";
+      patch = ./xen-pvclock-resume.patch;
     };
   
 }