Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-10 16:17:32 -08:00
parent 15102f7161 f9424a347f
commit 9e9e801d8e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zfs/lib/libspl/Makefile.in
View File

@ -11,6 +11,9 @@ LIBRARY := libspl
HOSTCFLAGS += @HOSTCFLAGS@ HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@LIBDIR@/libspl/include HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTLDFLAGS += -pthread
HOSTLDFLAGS += -lrt
hostprogs-y := zu hostprogs-y := zu
always := $(hostprogs-y) always := $(hostprogs-y)

3
zfs/lib/libspl/gethrtime.c
View File

@ -26,6 +26,7 @@
#pragma ident "%Z%%M% %I% %E% SMI" #pragma ident "%Z%%M% %I% %E% SMI"
#include <time.h>
#include <sys/time.h> #include <sys/time.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
@ -38,7 +39,7 @@ gethrtime(void)
rc = clock_gettime(CLOCK_MONOTONIC, &ts); rc = clock_gettime(CLOCK_MONOTONIC, &ts);
if (rc) { if (rc) {
fprintf(stderr, "Error: clock_gettime() = %d\n", rc) fprintf(stderr, "Error: clock_gettime() = %d\n", rc);
abort(); abort();
} }