From d427f43c25abedf9ee6ce63be26629e2cbf73719 Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 16 Oct 2014 22:04:07 +0000
Subject: [PATCH] Remove duplicated code.

Suggested by:	jmg
---
 lib/libc/string/Makefile.inc     |  1 +
 lib/libc/string/explicit_bzero.c | 22 ----------------------
 sys/libkern/explicit_bzero.c     |  4 ++++
 3 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 lib/libc/string/explicit_bzero.c

diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index 385837cce5a6..1217b7bc82d2 100644
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/string ${LIBC_SRCTOP}/string
+.PATH: ${LIBC_SRCTOP}/../../sys/libkern
 
 CFLAGS+= -I${LIBC_SRCTOP}/locale
 
diff --git a/lib/libc/string/explicit_bzero.c b/lib/libc/string/explicit_bzero.c
deleted file mode 100644
index a7811b037e8d..000000000000
--- a/lib/libc/string/explicit_bzero.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*	$OpenBSD: explicit_bzero.c,v 1.3 2014/06/21 02:34:26 matthew Exp $ */
-/*
- * Public domain.
- * Written by Matthew Dempsky.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <string.h>
-
-__attribute__((weak)) void
-__explicit_bzero_hook(void *buf, size_t len)
-{
-}
-
-void
-explicit_bzero(void *buf, size_t len)
-{
-	memset(buf, 0, len);
-	__explicit_bzero_hook(buf, len);
-}
diff --git a/sys/libkern/explicit_bzero.c b/sys/libkern/explicit_bzero.c
index 2468c5509d9d..dc3cbd6e8c76 100644
--- a/sys/libkern/explicit_bzero.c
+++ b/sys/libkern/explicit_bzero.c
@@ -7,7 +7,11 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#ifdef _KERNEL
 #include <sys/libkern.h>
+#else
+#include <string.h>
+#endif /* _KERNEL */
 
 __attribute__((weak)) void __explicit_bzero_hook(void *, size_t);