Move vmem* to libumem

diff --git a/scripts/update-zfs.sh b/scripts/update-zfs.sh
index c7f4ff86901ee16625f8cf2c2f8989453f01f21b..9324bc225be11ed24b2e4afc42924ff9b49ffd4a 100755 (executable)
--- a/scripts/update-zfs.sh
+++ b/scripts/update-zfs.sh
@@ -73,11 +73,11 @@ cp ${SRC_UCM}/sys/nvpair.h                  ${DST_LIB}/libnvpair/include/sys/
 cp ${SRC_UCM}/sys/nvpair_impl.h                        ${DST_LIB}/libnvpair/include/sys/
 
 echo "* zfs/lib/libumem"
-mkdir -p ${DST_LIB}/libumem/include/
-mkdir -p ${DST_LIB}/libumem/sys/
+mkdir -p ${DST_LIB}/libumem/include/sys/
 cp ${SRC_LIB}/libumem/common/*.c               ${DST_LIB}/libumem/
 cp ${SRC_LIB}/libumem/common/*.h               ${DST_LIB}/libumem/include/
-cp ${SRC_LIB}/libumem/common/sys/*.h           ${DST_LIB}/libumem/sys/
+cp ${SRC_LIB}/libumem/common/sys/*.h           ${DST_LIB}/libumem/include/sys/
+cp ${SRC_UCM}/sys/vmem.h                       ${DST_LIB}/libumem/include/sys/
 
 echo "* zfs/lib/libuutil"
 mkdir -p ${DST_LIB}/libuutil/include/
@@ -92,7 +92,6 @@ cp ${SRC_LIB}/libc/port/gen/strnlen.c         ${DST_LIB}/libspl/
 cp ${SRC_LIB}/libgen/common/mkdirp.c           ${DST_LIB}/libspl/
 cp ${SRC_CM}/unicode/u8_textprep.c             ${DST_LIB}/libspl/
 cp ${SRC_UCM}/os/list.c                                ${DST_LIB}/libspl/
-cp ${SRC_UCM}/sys/vmem.h                       ${DST_LIB}/libspl/include/sys/
 cp ${SRC_UCM}/sys/list.h                       ${DST_LIB}/libspl/include/sys/
 cp ${SRC_UCM}/sys/list_impl.h                  ${DST_LIB}/libspl/include/sys/
 

diff --git a/zfs/lib/libspl/include/sys/vmem.h b/zfs/lib/libumem/include/sys/vmem.h
similarity index 100%
rename from zfs/lib/libspl/include/sys/vmem.h
rename to zfs/lib/libumem/include/sys/vmem.h

diff --git a/zfs/lib/libumem/sys/vmem_impl_user.h b/zfs/lib/libumem/include/sys/vmem_impl_user.h
similarity index 100%
rename from zfs/lib/libumem/sys/vmem_impl_user.h
rename to zfs/lib/libumem/include/sys/vmem_impl_user.h