public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spl: Update from 0.6.3-1.2 -> 0.6.3-1.3

Browse Source 
Removed time.patch (applied upstream).
This commit is contained in:
Ricardo M. Correia 2015-03-19 01:03:50 +00:00
parent 2b8fd8d4e9
commit 1e28cd0c83
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/spl/default.nix
View File

@ -1,14 +1,14 @@
{ callPackage, fetchFromGitHub, ... } @ args: { callPackage, fetchFromGitHub, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "0.6.3-1.2"; version = "0.6.3-1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zfsonlinux"; owner = "zfsonlinux";
repo = "spl"; repo = "spl";
rev = "spl-${version}"; rev = "spl-${version}";
sha256 = "0id0m3sfpkz8w7b2pc51px8kvz8xnaf8msps57ddarxidmxvb45g"; sha256 = "1d4gdlkhshlyfkswbqx06fhs8m5lxgk3vhds6g7ipd3q93ngrczx";
}; };
patches = [ ./install_prefix.patch ./const.patch ./time.patch ]; patches = [ ./install_prefix.patch ./const.patch ];
}) })

18
pkgs/os-specific/linux/spl/time.patch
View File

@ -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);