From owner-svn-src-stable@FreeBSD.ORG Wed May 20 22:13:21 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 916591065673; Wed, 20 May 2009 22:13:21 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 780748FC1F; Wed, 20 May 2009 22:13:21 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4KMDLaH045653; Wed, 20 May 2009 22:13:21 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4KMDLcm045650; Wed, 20 May 2009 22:13:21 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200905202213.n4KMDLcm045650@svn.freebsd.org> From: Kip Macy Date: Wed, 20 May 2009 22:13:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192485 - in stable/7/sys: conf libkern sys X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2009 22:13:22 -0000 Author: kmacy Date: Wed May 20 22:13:21 2009 New Revision: 192485 URL: http://svn.freebsd.org/changeset/base/192485 Log: MFC memmove support ZFS MFC dependency Added: stable/7/sys/libkern/memmove.c (contents, props changed) Modified: stable/7/sys/conf/files stable/7/sys/sys/systm.h Modified: stable/7/sys/conf/files ============================================================================== --- stable/7/sys/conf/files Wed May 20 22:10:34 2009 (r192484) +++ stable/7/sys/conf/files Wed May 20 22:13:21 2009 (r192485) @@ -1755,6 +1755,7 @@ libkern/iconv_xlat16.c optional libicon libkern/index.c standard libkern/inet_ntoa.c standard libkern/mcount.c optional profiling-routine +libkern/memmove.c standard libkern/qsort.c standard libkern/qsort_r.c standard libkern/random.c standard Added: stable/7/sys/libkern/memmove.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/7/sys/libkern/memmove.c Wed May 20 22:13:21 2009 (r192485) @@ -0,0 +1,38 @@ +/*- + * Copyright (c) 2009 Roman Divacky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. +*/ + +#include +__FBSDID("$FreeBSD$"); + +#include + +void * +memmove(void *dest, const void *src, size_t n) +{ + + bcopy(src, dest, n); + return (dest); +} Modified: stable/7/sys/sys/systm.h ============================================================================== --- stable/7/sys/sys/systm.h Wed May 20 22:10:34 2009 (r192484) +++ stable/7/sys/sys/systm.h Wed May 20 22:13:21 2009 (r192485) @@ -191,6 +191,7 @@ void bcopy(const void *from, void *to, s void bzero(void *buf, size_t len) __nonnull(1); void *memcpy(void *to, const void *from, size_t len) __nonnull(1) __nonnull(2); +void *memmove(void *dest, const void *src, size_t len) __nonnull(1) __nonnull(2); int copystr(const void * __restrict kfaddr, void * __restrict kdaddr, size_t len, size_t * __restrict lencopied)