mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-25 03:37:45 +03:00
freebsd: changes necessary to coexist with dtrace in tree
Fix header conflicts when building zfs with openzfs as a vendor import. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Ryan Moeller <ryan@ixsystems.com> Signed-off-by: Matt Macy <mmacy@FreeBSD.org> Closes #10497
This commit is contained in:
@@ -35,7 +35,6 @@
|
||||
#include <sys/spl_condvar.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/kmem.h>
|
||||
|
||||
/*
|
||||
* cv_timedwait() is similar to cv_wait() except that it additionally expects
|
||||
|
||||
Reference in New Issue
Block a user