Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Dec 2015 03:34:43 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r292641 - head/sys/kern
Message-ID:  <201512230334.tBN3Yhob067869@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512230334.tBN3Yhob067869>