From owner-svn-src-head@freebsd.org  Wed Dec 23 03:34:44 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 523D4A50605;
 Wed, 23 Dec 2015 03:34:44 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 214591807;
 Wed, 23 Dec 2015 03:34:44 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBN3Yhbt067870;
 Wed, 23 Dec 2015 03:34:43 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBN3Yhob067869;
 Wed, 23 Dec 2015 03:34:43 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201512230334.tBN3Yhob067869@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 23 Dec 2015 03:34:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292641 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Dec 2015 03:34:44 -0000

Author: ngie
Date: Wed Dec 23 03:34:43 2015
New Revision: 292641
URL: https://svnweb.freebsd.org/changeset/base/292641

Log:
  Fix r292640
  
  vim overzealously removed some trailing `+' and I didn't check the
  diff
  
  MFC after: 1 week
  X-MFC with: r292640
  Pointyhat to: ngie
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/kern/link_elf.c

Modified: head/sys/kern/link_elf.c
==============================================================================
--- head/sys/kern/link_elf.c	Wed Dec 23 03:29:37 2015	(r292640)
+++ head/sys/kern/link_elf.c	Wed Dec 23 03:34:43 2015	(r292641)
@@ -438,7 +438,7 @@ link_elf_init(void* arg)
 		ctors_sizep = (Elf_Size *)preload_search_info(modptr,
 			MODINFO_METADATA | MODINFOMD_CTORS_SIZE);
 		if (ctors_addrp != NULL && ctors_sizep != NULL) {
-			linker_kernel_file->ctors_addr = ef->address
+			linker_kernel_file->ctors_addr = ef->address +
 			    *ctors_addrp;
 			linker_kernel_file->ctors_size = *ctors_sizep;
 		}
@@ -979,7 +979,7 @@ link_elf_load_file(linker_class_t cls, c
 #ifdef GPROF
 	/* Update profiling information with the new text segment. */
 	mtx_lock(&Giant);
-	kmupetext((uintfptr_t)(mapbase + segs[0]->p_vaddr - base_vaddr
+	kmupetext((uintfptr_t)(mapbase + segs[0]->p_vaddr - base_vaddr +
 	    segs[0]->p_memsz));
 	mtx_unlock(&Giant);
 #endif