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

configure.ac

@@ -120,5 +120,6 @@ AC_CONFIG_FILES([ Makefile
                   cmd/zinject/Makefile
                   cmd/zpool/Makefile
                   cmd/ztest/Makefile
+                  cmd/zpios/Makefile
                ])
 AC_OUTPUT

module/Makefile.in

@@ -1,4 +1,4 @@
-subdir-m = avl nvpair zcommon zfs
+subdir-m = avl nvpair zcommon zfs zpios
 
 # Make the exported SPL symbols available to these modules.
 # Unfortunately there is not a cleaner way to do this, modpost

zfs/zcmd/zpios/Makefile.in

@@ -1,13 +0,0 @@
-DISTFILES = Makefile.in *.c zpios.h
-
-CMD := zpios
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@CMDDIR@/lzpios
-HOSTCFLAGS += -I@LIBDIR@/libzpios/include
-
-hostprogs-y := ${CMD}
-always := $(hostprogs-y)
-
-${CMD}-objs += zpios_main.o
-${CMD}-objs += zpios_util.o