From owner-p4-projects  Sun May  5 13:36:53 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4232537B405; Sun,  5 May 2002 13:36:47 -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 E8A4337B401
	for <perforce@freebsd.org>; Sun,  5 May 2002 13:36:45 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g45Kajt99003
	for perforce@freebsd.org; Sun, 5 May 2002 13:36:45 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Sun, 5 May 2002 13:36:45 -0700 (PDT)
Message-Id: <200205052036.g45Kajt99003@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 10836 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=10836

Change 10836 by peter@peter_thunder on 2002/05/05 13:36:04

	attempt to solve:
	can't re-use a leaf (elf_trace)!
	can't re-use a leaf (elf_trace)!
	(ie: duplicate sysctl's)

Affected files ...

... //depot/projects/ia64/sys/kern/imgact_elf.c#5 edit

Differences ...

==== //depot/projects/ia64/sys/kern/imgact_elf.c#5 (text+ko) ====

@@ -82,7 +82,11 @@
 static int __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp);
 
 static int elf_trace = 0;
-SYSCTL_INT(_debug, OID_AUTO, elf_trace, CTLFLAG_RW, &elf_trace, 0, "");
+#if __ELF_WORD_SIZE == 32
+SYSCTL_INT(_debug, OID_AUTO, elf32_trace, CTLFLAG_RW, &elf_trace, 0, "");
+#else
+SYSCTL_INT(_debug, OID_AUTO, elf64_trace, CTLFLAG_RW, &elf_trace, 0, "");
+#endif
 
 struct sysentvec __elfN(freebsd_sysvec) = {
         SYS_MAXSYSCALL,

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message