Move the nvlist source and private includes from sys/kern to seperate

directory sys/contrib/libnv.

The goal of this operation is to NOT install header files which shouldn't
be used outside the nvlist library.

Approved by:	pjd (mentor)

8 files changed, 20 insertions, 19 deletions

diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile
index 1aef64e68597..38ec009815b7 100644
--- a/lib/libnv/Makefile
+++ b/lib/libnv/Makefile
@@ -7,13 +7,13 @@ SHLIBDIR?= /lib
 LIB=	nv
 SHLIB_MAJOR= 0
 
-.PATH: ${.CURDIR}/../../sys/kern ${.CURDIR}/../../sys/sys
+.PATH: ${.CURDIR}/../../sys/contrib/libnv ${.CURDIR}/../../sys/sys
 CFLAGS+=-I${.CURDIR}/../../sys -I${.CURDIR}
 
-SRCS=	subr_dnvlist.c
+SRCS=	dnvlist.c
 SRCS+=	msgio.c
-SRCS+=	subr_nvlist.c
-SRCS+=	subr_nvpair.c
+SRCS+=	nvlist.c
+SRCS+=	nvpair.c
 
 WARNS?=	6
 
diff --git a/sys/conf/files b/sys/conf/files
index a87ca29208c1..65ad1026f911 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -476,6 +476,9 @@ contrib/libfdt/fdt_rw.c		optional fdt
 contrib/libfdt/fdt_strerror.c	optional fdt
 contrib/libfdt/fdt_sw.c		optional fdt
 contrib/libfdt/fdt_wip.c	optional fdt
+contrib/libnv/dnvlist.c		standard
+contrib/libnv/nvlist.c		standard
+contrib/libnv/nvpair.c		standard
 contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm \
 	compile-with "${NORMAL_C_NOWERROR} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm \
@@ -3054,7 +3057,6 @@ kern/subr_clock.c		standard
 kern/subr_counter.c		standard
 kern/subr_devstat.c		standard
 kern/subr_disk.c		standard
-kern/subr_dnvlist.c		standard
 kern/subr_eventhandler.c	standard
 kern/subr_fattime.c		standard
 kern/subr_firmware.c		optional firmware
@@ -3068,8 +3070,6 @@ kern/subr_mbpool.c		optional libmbpool
 kern/subr_mchain.c		optional libmchain
 kern/subr_module.c		standard
 kern/subr_msgbuf.c		standard
-kern/subr_nvlist.c		standard
-kern/subr_nvpair.c		standard
 kern/subr_param.c		standard
 kern/subr_pcpu.c		standard
 kern/subr_pctrie.c		standard
diff --git a/sys/kern/subr_dnvlist.c b/sys/contrib/libnv/dnvlist.c
index 9058520fbda9..c2106c5a4b15 100644
--- a/sys/kern/subr_dnvlist.c
+++ b/sys/contrib/libnv/dnvlist.c
@@ -47,10 +47,10 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #endif
 
+#include <sys/dnv.h>
 #include <sys/nv.h>
-#include <sys/nv_impl.h>
 
-#include <sys/dnv.h>
+#include "nv_impl.h"
 
 #define	DNVLIST_GET(ftype, type)					\
 ftype									\
diff --git a/sys/sys/nv_impl.h b/sys/contrib/libnv/nv_impl.h
index c088c3d03bfc..c088c3d03bfc 100644
--- a/sys/sys/nv_impl.h
+++ b/sys/contrib/libnv/nv_impl.h
diff --git a/sys/kern/subr_nvlist.c b/sys/contrib/libnv/nvlist.c
index de1972e42c59..3138001eab4b 100644
--- a/sys/kern/subr_nvlist.c
+++ b/sys/contrib/libnv/nvlist.c
@@ -65,9 +65,10 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include <sys/nv.h>
-#include <sys/nv_impl.h>
-#include <sys/nvlist_impl.h>
-#include <sys/nvpair_impl.h>
+
+#include "nv_impl.h"
+#include "nvlist_impl.h"
+#include "nvpair_impl.h"
 
 #ifndef	HAVE_PJDLOG
 #ifdef _KERNEL
diff --git a/sys/sys/nvlist_impl.h b/sys/contrib/libnv/nvlist_impl.h
index 8aeac672a842..18ccebf87969 100644
--- a/sys/sys/nvlist_impl.h
+++ b/sys/contrib/libnv/nvlist_impl.h
@@ -32,12 +32,12 @@
 #ifndef	_NVLIST_IMPL_H_
 #define	_NVLIST_IMPL_H_
 
+#include <sys/nv.h>
+
 #ifndef _KERNEL
 #include <stdint.h>
 #endif
 
-#include "nv.h"
-
 nvpair_t *nvlist_get_nvpair_parent(const nvlist_t *nvl);
 const unsigned char *nvlist_unpack_header(nvlist_t *nvl,
     const unsigned char *ptr, size_t nfds, bool *isbep, size_t *leftp);
diff --git a/sys/kern/subr_nvpair.c b/sys/contrib/libnv/nvpair.c
index 44b0ab89674d..7146767521b8 100644
--- a/sys/kern/subr_nvpair.c
+++ b/sys/contrib/libnv/nvpair.c
@@ -61,9 +61,10 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include <sys/nv.h>
-#include <sys/nv_impl.h>
-#include <sys/nvlist_impl.h>
-#include <sys/nvpair_impl.h>
+
+#include "nv_impl.h"
+#include "nvlist_impl.h"
+#include "nvpair_impl.h"
 
 #ifndef	HAVE_PJDLOG
 #ifdef _KERNEL
diff --git a/sys/sys/nvpair_impl.h b/sys/contrib/libnv/nvpair_impl.h
index 61885e6409bb..fed77259bc38 100644
--- a/sys/sys/nvpair_impl.h
+++ b/sys/contrib/libnv/nvpair_impl.h
@@ -32,14 +32,13 @@
 #ifndef	_NVPAIR_IMPL_H_
 #define	_NVPAIR_IMPL_H_
 
+#include <sys/nv.h>
 #include <sys/queue.h>
 
 #ifndef _KERNEL
 #include <stdint.h>
 #endif
 
-#include "nv.h"
-
 TAILQ_HEAD(nvl_head, nvpair);
 
 void nvpair_assert(const nvpair_t *nvp);