diff options
| author | Xin LI <delphij@FreeBSD.org> | 2014-08-03 09:47:51 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2014-08-03 09:47:51 +0000 |
| commit | cd741a5e1d293cf63b684fa99a22c15aeac536cc (patch) | |
| tree | 0cac2148bcf12b99df5940fed8b56243e7b19ff4 /sys/cddl/compat | |
| parent | bcdd3bceb614cf9c5826d81087c30c089620fa10 (diff) | |
| download | src-cd741a5e1d293cf63b684fa99a22c15aeac536cc.tar.gz src-cd741a5e1d293cf63b684fa99a22c15aeac536cc.zip | |
Revert r269404 and use cpu_ticks() for dbuf allocation.
Encode CPU's number by XOR'ing the CPU ID against the 64-bit cpu_ticks().
Reviewed by: mav, gibbs
Differential Revision: https://phabric.freebsd.org/D521
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=269466
Diffstat (limited to 'sys/cddl/compat')
| -rw-r--r-- | sys/cddl/compat/opensolaris/sys/time.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/cddl/compat/opensolaris/sys/time.h b/sys/cddl/compat/opensolaris/sys/time.h index cab715fafeaf..fe4857ad1f92 100644 --- a/sys/cddl/compat/opensolaris/sys/time.h +++ b/sys/cddl/compat/opensolaris/sys/time.h @@ -60,17 +60,6 @@ gethrtime(void) { struct timespec ts; hrtime_t nsec; - nanouptime(&ts); - nsec = (hrtime_t)ts.tv_sec * NANOSEC + ts.tv_nsec; - return (nsec); -} - -static __inline hrtime_t -gethrtime_waitfree(void) { - - struct timespec ts; - hrtime_t nsec; - getnanouptime(&ts); nsec = (hrtime_t)ts.tv_sec * NANOSEC + ts.tv_nsec; return (nsec); @@ -78,6 +67,7 @@ gethrtime_waitfree(void) { #define gethrestime_sec() (time_second) #define gethrestime(ts) getnanotime(ts) +#define gethrtime_waitfree() gethrtime() extern int nsec_per_tick; /* nanoseconds per clock tick */ |