Date: Mon, 8 Apr 2002 16:59:43 -0700 (PDT) From: Jake Burkholder <jake@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9407 for review Message-ID: <200204082359.g38NxhZ06335@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9407 Change 9407 by jake@jake_sparc64 on 2002/04/08 16:59:33 Revert unneeded change from kld testing. Affected files ... ... //depot/projects/sparc64/sys/kern/link_elf.c#11 edit Differences ... ==== //depot/projects/sparc64/sys/kern/link_elf.c#11 (text+ko) ==== @@ -615,8 +615,6 @@ * We rely on there being exactly two load segments, text and data, * in that order. */ - segs[0] = 0; - segs[1] = 0; phdr = (Elf_Phdr *) (firstpage + hdr->e_phoff); phlimit = phdr + hdr->e_phnum; nsegs = 0; @@ -663,10 +661,7 @@ */ base_offset = trunc_page(segs[0]->p_offset); base_vaddr = trunc_page(segs[0]->p_vaddr); - if (segs[1] != NULL) - base_vlimit = round_page(segs[1]->p_vaddr + segs[1]->p_memsz); - else - base_vlimit = round_page(segs[0]->p_vaddr + segs[0]->p_memsz); + base_vlimit = round_page(segs[1]->p_vaddr + segs[1]->p_memsz); mapsize = base_vlimit - base_vaddr; lf = linker_make_file(filename, &link_elf_class); @@ -707,10 +702,7 @@ * Read the text and data sections and zero the bss. */ for (i = 0; i < 2; i++) { - caddr_t segbase; - if (segs[i] == NULL) - continue; - segbase = mapbase + segs[i]->p_vaddr - base_vaddr; + caddr_t segbase = mapbase + segs[i]->p_vaddr - base_vaddr; error = vn_rdwr(UIO_READ, nd.ni_vp, segbase, segs[i]->p_filesz, segs[i]->p_offset, UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, &resid, td); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204082359.g38NxhZ06335>