diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2015-12-23 03:34:43 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2015-12-23 03:34:43 +0000 |
| commit | 853a17ad6f25afcb2623062b145c8b38f4796b51 (patch) | |
| tree | 1705b35ddf0bebde87a0ddd8ba94cf68f8ec467f | |
| parent | 905b145f0adb8719535caa28d58e5c540268c013 (diff) | |
| download | src-853a17ad6f25afcb2623062b145c8b38f4796b51.tar.gz src-853a17ad6f25afcb2623062b145c8b38f4796b51.zip | |
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
Notes
Notes:
svn path=/head/; revision=292641
| -rw-r--r-- | sys/kern/link_elf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 9931e4a3ae9b..bf2dfd00a375 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; } @@ -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 |