--- a/usr/src/lib/libfru/libnvfru/Makefile	Thu Nov 12 18:13:18 2009 -0800
+++ b/usr/src/lib/libfru/libnvfru/Makefile	Thu Nov 12 18:31:32 2009 -0800
@@ -40,7 +40,7 @@
 sparc_HDRS=
 sparcv9_HDRS=
 i386_HDRS=
-HDRS=	$($(MACH)_HDRS)
+HDRS=		nvfru.h $($(MACH)_HDRS)
 ROOTHDRDIR=     $(ROOT)/usr/include
 ROOTHDRS=       $(HDRS:%=$(ROOTHDRDIR)/%)
 CHECKHDRS=      $(HDRS:%.h=%.check)
@@ -58,6 +58,8 @@
 $(ROOTHDRDIR):
 	$(INS.dir)
 
+install_h: $(ROOTHDRS)
+
 check: $(CHECKHDRS)
 
 $(MACH) $(MACH64): FRC

--- a/usr/src/lib/libfru/libnvfru/Makefile.com	Thu Nov 12 18:13:18 2009 -0800
+++ b/usr/src/lib/libfru/libnvfru/Makefile.com	Thu Nov 12 18:31:32 2009 -0800
@@ -35,8 +35,6 @@
 
 LIBS =		$(DYNLIB)
 
-MAPFILES =
-
 LINTFLAGS =	-uxn
 LINTFLAGS64 =	$(LINTFLAGS) -m64
 LINTOUT=	lint.out

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libfru/libnvfru/mapfile-vers	Thu Nov 12 18:31:32 2009 -0800
@@ -0,0 +1,46 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+SUNWprivate_1.1 {
+    global:
+	rawfru_to_nvlist;
+
+    local:
+	*;
+};

--- a/usr/src/lib/libfru/libnvfru/nvfru.c	Thu Nov 12 18:13:18 2009 -0800
+++ b/usr/src/lib/libfru/libnvfru/nvfru.c	Thu Nov 12 18:31:32 2009 -0800
@@ -38,10 +38,10 @@
 #include "libfrup.h"
 #include "fru_tag.h"
 #include "libfrureg.h"
-
+#include "nvfru.h"
 
 #define	NUM_ITER_BYTES	4
-#define	HEAD_ITER 	0
+#define	HEAD_ITER	0
 #define	TAIL_ITER	1
 #define	NUM_ITER	2
 #define	MAX_ITER	3

--- a/usr/src/lib/libfru/libnvfru/nvfru.h	Thu Nov 12 18:13:18 2009 -0800
+++ b/usr/src/lib/libfru/libnvfru/nvfru.h	Thu Nov 12 18:31:32 2009 -0800
@@ -34,7 +34,7 @@
 extern "C" {
 #endif
 
-int rawfru_to_nvlist(uint8_t *, size_t, char *, nvlist_t **);
+extern int rawfru_to_nvlist(uint8_t *, size_t, char *, nvlist_t **);
 
 #ifdef  __cplusplus
 	}

--- a/usr/src/pkgdefs/etc/exception_list_i386	Thu Nov 12 18:13:18 2009 -0800
+++ b/usr/src/pkgdefs/etc/exception_list_i386	Thu Nov 12 18:31:32 2009 -0800
@@ -1258,3 +1258,5 @@
 usr/lib/llib-lrstp		i386
 usr/lib/llib-lrstp.ln		i386
 
+# Private nvfru API
+usr/include/nvfru.h			i386

--- a/usr/src/pkgdefs/etc/exception_list_sparc	Thu Nov 12 18:13:18 2009 -0800
+++ b/usr/src/pkgdefs/etc/exception_list_sparc	Thu Nov 12 18:31:32 2009 -0800
@@ -1347,3 +1347,6 @@
 usr/lib/librstp.so		sparc
 usr/lib/llib-lrstp		sparc
 usr/lib/llib-lrstp.ln		sparc
+
+# Private nvfru API
+usr/include/nvfru.h			sparc