Date: Thu, 31 Dec 2015 20:52:39 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r293005 - stable/9/sys/kern Message-ID: <201512312052.tBVKqdC2046230@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Dec 31 20:52:39 2015 New Revision: 293005 URL: https://svnweb.freebsd.org/changeset/base/293005 Log: MFstable/10 r293003: MFC r292640,r292641: r292640: Clean up trailing whitespace; no functional change r292641: Fix r292640 vim overzealously removed some trailing `+' and I didn't check the diff Pointyhat to: ngie Modified: stable/9/sys/kern/link_elf.c Directory Properties: stable/9/ (props changed) stable/9/sys/ (props changed) Modified: stable/9/sys/kern/link_elf.c ============================================================================== --- stable/9/sys/kern/link_elf.c Thu Dec 31 20:51:05 2015 (r293004) +++ stable/9/sys/kern/link_elf.c Thu Dec 31 20:52:39 2015 (r293005) @@ -575,7 +575,7 @@ parse_dynamic(elf_file_t ef) static int parse_dpcpu(elf_file_t ef) -{ +{ int count; int error; @@ -606,7 +606,7 @@ parse_dpcpu(elf_file_t ef) #ifdef VIMAGE static int parse_vnet(elf_file_t ef) -{ +{ int count; int error; @@ -884,7 +884,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; @@ -1439,7 +1439,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 && @@ -1613,7 +1613,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?201512312052.tBVKqdC2046230>