NEX-9559 remove nza-closed cruft
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Reviewed by: Steve Peng <steve.peng@nexenta.com>
NEX-3508 CLONE - Port NEX-2946 Add UNMAP/TRIM functionality to ZFS and illumos
Reviewed by: Josef Sipek <josef.sipek@nexenta.com>
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>
Conflicts:
    usr/src/uts/common/io/scsi/targets/sd.c
    usr/src/uts/common/sys/scsi/targets/sddef.h
Fix up some merges where we wanted the upstream version.
re #12585 rb4049 ZFS++ work port - refactoring to improve separation of open/closed code, bug fixes, performance improvements - open code

@@ -27,11 +27,11 @@
 LIBRARY= libzpool.a
 VERS= .1
 
 # include the list of ZFS sources
 include ../../../uts/common/Makefile.files
-KERNEL_OBJS = kernel.o util.o
+KERNEL_OBJS = kernel.o util.o dkioc_free_util.o
 DTRACE_OBJS = zfs.o
 
 OBJECTS=$(LUA_OBJS) $(ZFS_COMMON_OBJS) $(ZFS_SHARED_OBJS) $(KERNEL_OBJS)
 
 # include library definitions

@@ -109,5 +109,9 @@
         $(COMPILE.d) -C -s $< -o $@ $(PICS)
         $(POST_PROCESS_O)
 
 ../common/%.h: ../common/%.d
         $(DTRACE) -xnolibs -h -s $< -o $@
+
+pics/%.o: ../../../uts/common/os/%.c
+        $(COMPILE.c) -o $@ $<
+        $(POST_PROCESS_O)