aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2015-12-23 03:29:37 +0000
committerEnji Cooper <ngie@FreeBSD.org>2015-12-23 03:29:37 +0000
commit905b145f0adb8719535caa28d58e5c540268c013 (patch)
treec111dcb7310205a731c88444f341eb60682ecb0f
parent29e6019890af018eb99fe986d5286844954a8da2 (diff)
downloadsrc-905b145f0adb8719535caa28d58e5c540268c013.tar.gz
src-905b145f0adb8719535caa28d58e5c540268c013.zip
Clean up trailing whitespace; no functional change
MFC after: 1 week Sponsored by: EMC / Isilon Storage Division
Notes
Notes: svn path=/head/; revision=292640
-rw-r--r--sys/kern/link_elf.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index d73c12dfb408..9931e4a3ae9b 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -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, const char* filename,
*/
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, const char* filename,
#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_t 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, const Elf_Sym **symtab)
return (ef->ddbsymcnt);
}
-
+
static long
link_elf_strtab_get(linker_file_t lf, caddr_t *strtab)
{