Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Dec 2015 03:29:37 +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: r292640 - head/sys/kern
Message-ID:  <201512230329.tBN3Tboq065090@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Wed Dec 23 03:29:37 2015
New Revision: 292640
URL: https://svnweb.freebsd.org/changeset/base/292640

Log:
  Clean up trailing whitespace; no functional change
  
  MFC after: 1 week
  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:19:12 2015	(r292639)
+++ head/sys/kern/link_elf.c	Wed Dec 23 03:29:37 2015	(r292640)
@@ -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;
 		}
@@ -605,7 +605,7 @@ parse_dynamic(elf_file_t ef)
 
 static int
 parse_dpcpu(elf_file_t ef)
-{ 
+{
 	int count;
 	int error;
 
@@ -636,7 +636,7 @@ parse_dpcpu(elf_file_t ef)
 #ifdef VIMAGE
 static int
 parse_vnet(elf_file_t ef)
-{ 
+{
 	int count;
 	int error;
 
@@ -916,7 +916,7 @@ link_elf_load_file(linker_class_t cls, c
 	 */
 	base_offset = trunc_page(segs[0]->p_offset);
 	base_vaddr = trunc_page(segs[0]->p_vaddr);
-	base_vlimit = round_page(segs[nsegs - 1]->p_vaddr + 
+	base_vlimit = round_page(segs[nsegs - 1]->p_vaddr +
 	    segs[nsegs - 1]->p_memsz);
 	mapsize = base_vlimit - base_vaddr;
 
@@ -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
@@ -1481,7 +1481,7 @@ link_elf_each_function_name(linker_file_
 	elf_file_t ef = (elf_file_t)file;
 	const Elf_Sym *symp;
 	int i, error;
-	
+
 	/* Exhaustive search */
 	for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) {
 		if (symp->st_value != 0 &&
@@ -1652,7 +1652,7 @@ link_elf_symtab_get(linker_file_t lf, co
 
 	return (ef->ddbsymcnt);
 }
-    
+
 static long
 link_elf_strtab_get(linker_file_t lf, caddr_t *strtab)
 {



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