From owner-svn-src-stable-10@FreeBSD.ORG  Sat Apr 12 14:18:25 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E9862FB5;
 Sat, 12 Apr 2014 14:18:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D4F8B1B31;
 Sat, 12 Apr 2014 14:18:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CEIPTi072514;
 Sat, 12 Apr 2014 14:18:25 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3CEIPDM072513;
 Sat, 12 Apr 2014 14:18:25 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201404121418.s3CEIPDM072513@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 12 Apr 2014 14:18:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r264370 - stable/10/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Apr 2014 14:18:26 -0000

Author: kib
Date: Sat Apr 12 14:18:25 2014
New Revision: 264370
URL: http://svnweb.freebsd.org/changeset/base/264370

Log:
  MFC r264173:
  Use realloc(9) instead of doing the reallocation inline.

Modified:
  stable/10/sys/kern/kern_linker.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_linker.c
==============================================================================
--- stable/10/sys/kern/kern_linker.c	Sat Apr 12 14:09:35 2014	(r264369)
+++ stable/10/sys/kern/kern_linker.c	Sat Apr 12 14:18:25 2014	(r264370)
@@ -725,14 +725,8 @@ linker_file_add_dependency(linker_file_t
 	linker_file_t *newdeps;
 
 	sx_assert(&kld_sx, SA_XLOCKED);
-	newdeps = malloc((file->ndeps + 1) * sizeof(*newdeps), M_LINKER,
-	    M_WAITOK | M_ZERO);
-
-	if (file->deps) {
-		bcopy(file->deps, newdeps, file->ndeps * sizeof(*newdeps));
-		free(file->deps, M_LINKER);
-	}
-	file->deps = newdeps;
+	file->deps = realloc(file->deps, (file->ndeps + 1) * sizeof(*newdeps),
+	    M_LINKER, M_WAITOK | M_ZERO);
 	file->deps[file->ndeps] = dep;
 	file->ndeps++;
 	KLD_DPF(FILE, ("linker_file_add_dependency:"