From 1e28cd0c83bcbf0621189f7357dcec49dd98f7d5 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 19 Mar 2015 01:03:50 +0000
Subject: [PATCH] spl: Update from 0.6.3-1.2 -> 0.6.3-1.3

Removed time.patch (applied upstream).
---
 pkgs/os-specific/linux/spl/default.nix |  6 +++---
 pkgs/os-specific/linux/spl/time.patch  | 18 ------------------
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/spl/time.patch

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 618b59b32aa..4e13aa2687c 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -1,14 +1,14 @@
 { callPackage, fetchFromGitHub, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "0.6.3-1.2";
+  version = "0.6.3-1.3";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "spl";
     rev = "spl-${version}";
-    sha256 = "0id0m3sfpkz8w7b2pc51px8kvz8xnaf8msps57ddarxidmxvb45g";
+    sha256 = "1d4gdlkhshlyfkswbqx06fhs8m5lxgk3vhds6g7ipd3q93ngrczx";
   };
 
-  patches = [ ./install_prefix.patch ./const.patch ./time.patch ];
+  patches = [ ./install_prefix.patch ./const.patch ];
 })
diff --git a/pkgs/os-specific/linux/spl/time.patch b/pkgs/os-specific/linux/spl/time.patch
deleted file mode 100644
index 6b1e23bc05e..00000000000
--- a/pkgs/os-specific/linux/spl/time.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/module/spl/spl-time.c b/module/spl/spl-time.c
-index 0ed49cc..b0fad4f 100644
---- a/module/spl/spl-time.c
-+++ b/module/spl/spl-time.c
-@@ -40,12 +40,7 @@ extern unsigned long long monotonic_clock(void);
- void
- __gethrestime(timestruc_t *ts)
- {
--	struct timespec tspec;
--
--	getnstimeofday(&tspec);
--
--	ts->tv_sec = tspec.tv_sec;
--	ts->tv_nsec = tspec.tv_nsec;
-+	*ts = current_kernel_time();
- }
- EXPORT_SYMBOL(__gethrestime);
-