From owner-p4-projects  Wed Oct 23 11:47:48 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AA09D37B404; Wed, 23 Oct 2002 11:47:46 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4100B37B401
	for <perforce@freebsd.org>; Wed, 23 Oct 2002 11:47:46 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1143E43E9C
	for <perforce@freebsd.org>; Wed, 23 Oct 2002 11:47:43 -0700 (PDT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NIl3mV021217
	for <perforce@freebsd.org>; Wed, 23 Oct 2002 11:47:03 -0700 (PDT)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NIl2SG021214
	for perforce@freebsd.org; Wed, 23 Oct 2002 11:47:02 -0700 (PDT)
Date: Wed, 23 Oct 2002 11:47:02 -0700 (PDT)
Message-Id: <200210231847.g9NIl2SG021214@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 19984 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://perforce.freebsd.org/chv.cgi?CH=19984

Change 19984 by jhb@jhb_laptop on 2002/10/23 11:46:20

	Bah, merge-o.

Affected files ...

.. //depot/projects/smpng/sys/sys/proc.h#62 edit

Differences ...

==== //depot/projects/smpng/sys/sys/proc.h#62 (text+ko) ====

@@ -289,7 +289,7 @@
 	void		(*td_switchin)(void); /* (k) Switchin special func. */
 	struct thread	*td_standin;	/* (?) use this for an upcall */
 	u_int		td_critnest;	/* (k) Critical section nest level. */
-#define	td_endzero td_td_base_pri
+#define	td_endzero td_base_pri
 
 /* Copied during fork1() or thread_sched_upcall() */
 #define	td_startcopy td_endzero

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