Move libnv into the kernel and hook it into the kernel build

Differential Revision:		https://reviews.freebsd.org/D1883
Reviewed by:			jfv
MFC after:			1 month
Sponsored by:			Sandvine Inc.
This commit is contained in:
Ryan Stone 2015-03-01 00:34:27 +00:00
parent 814f9a1824
commit 4d6a976e37
10 changed files with 24 additions and 16 deletions

View File

@ -7,10 +7,13 @@ SHLIBDIR?= /lib
LIB= nv
SHLIB_MAJOR= 0
SRCS= dnvlist.c
.PATH: ${.CURDIR}/../../sys/kern ${.CURDIR}/../../sys/sys
CFLAGS+=-I${.CURDIR}/../../sys -I${.CURDIR}
SRCS= subr_dnvlist.c
SRCS+= msgio.c
SRCS+= nvlist.c
SRCS+= nvpair.c
SRCS+= subr_nvlist.c
SRCS+= subr_nvpair.c
INCS= dnv.h
INCS+= nv.h

View File

@ -3076,6 +3076,7 @@ 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
@ -3089,6 +3090,8 @@ 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

View File

@ -47,10 +47,10 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#endif
#include "nv.h"
#include "nv_impl.h"
#include <sys/nv.h>
#include <sys/nv_impl.h>
#include "dnv.h"
#include <sys/dnv.h>
#define DNVLIST_GET(ftype, type) \
ftype \

View File

@ -56,17 +56,18 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "msgio.h"
#endif
#ifdef HAVE_PJDLOG
#include <pjdlog.h>
#endif
#include "msgio.h"
#include "nv.h"
#include "nv_impl.h"
#include "nvlist_impl.h"
#include "nvpair_impl.h"
#include <sys/nv.h>
#include <sys/nv_impl.h>
#include <sys/nvlist_impl.h>
#include <sys/nvpair_impl.h>
#ifndef HAVE_PJDLOG
#ifdef _KERNEL

View File

@ -52,17 +52,18 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "common_impl.h"
#endif
#ifdef HAVE_PJDLOG
#include <pjdlog.h>
#endif
#include "common_impl.h"
#include "nv.h"
#include "nv_impl.h"
#include "nvlist_impl.h"
#include "nvpair_impl.h"
#include <sys/nv.h>
#include <sys/nv_impl.h>
#include <sys/nvlist_impl.h>
#include <sys/nvpair_impl.h>
#ifndef HAVE_PJDLOG
#ifdef _KERNEL