From owner-p4-projects@FreeBSD.ORG  Mon Mar  6 19:27:53 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B5C8916A423; Mon,  6 Mar 2006 19:27:52 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 7141516A420
	for <perforce@freebsd.org>; Mon,  6 Mar 2006 19:27:52 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9533043D6D
	for <perforce@freebsd.org>; Mon,  6 Mar 2006 19:27:50 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k26JRowY086923
	for <perforce@freebsd.org>; Mon, 6 Mar 2006 19:27:50 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k26JRokZ086920
	for perforce@freebsd.org; Mon, 6 Mar 2006 19:27:50 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 6 Mar 2006 19:27:50 GMT
Message-Id: <200603061927.k26JRokZ086920@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 92865 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Mar 2006 19:27:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=92865

Change 92865 by jhb@jhb_twclab on 2006/03/06 19:26:49

	Compile some more.

Affected files ...

.. //depot/projects/smpng/sys/alpha/alpha/clock.c#24 edit
.. //depot/projects/smpng/sys/alpha/include/pcpu.h#7 edit

Differences ...

==== //depot/projects/smpng/sys/alpha/alpha/clock.c#24 (text+ko) ====

@@ -577,7 +577,7 @@
 	if (pcc_cnt < PCPU_GET(last_pcc_cnt))
 		PCPU_SET(pcc_base, PCPU_GET(pcc_base) + 1);
 	PCPU_SET(last_pcc_cnt, pcc_cnt);
-	return (pcc_cnt | (PCPU_GET(pcc_base) << 32));
+	return (pcc_cnt | ((uint64_t)PCPU_GET(pcc_base) << 32));
 }
 
 int

==== //depot/projects/smpng/sys/alpha/include/pcpu.h#7 (text+ko) ====

@@ -39,8 +39,8 @@
 	u_int64_t	pc_pending_ipis;	/* pending IPI's */	\
 	u_int32_t	pc_next_asn;		/* next ASN to alloc */	\
 	u_int32_t	pc_current_asngen;	/* ASN rollover check */ \
-	u_int32_t	pc_last_ppc_cnt;	/* Previous PCC_CNT value */ \
-	u_int32_t	pc_ppc_base		/* Hi word of cycle count. */
+	u_int32_t	pc_last_pcc_cnt;	/* Previous PCC_CNT value */ \
+	u_int32_t	pc_pcc_base		/* Hi word of cycle count. */
 
 struct pcpu;