From owner-p4-projects  Mon Apr  8 17: 0:11 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7F0E637B416; Mon,  8 Apr 2002 16:59:44 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 3D2B237B400
	for <perforce@freebsd.org>; Mon,  8 Apr 2002 16:59:43 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g38NxhZ06335
	for perforce@freebsd.org; Mon, 8 Apr 2002 16:59:43 -0700 (PDT)
	(envelope-from jake@freebsd.org)
Date: Mon, 8 Apr 2002 16:59:43 -0700 (PDT)
Message-Id: <200204082359.g38NxhZ06335@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f
From: Jake Burkholder <jake@FreeBSD.org>
Subject: PERFORCE change 9407 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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