From owner-p4-projects  Tue Mar 19  2:42:24 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4B2B137B41E; Tue, 19 Mar 2002 02:42:19 -0800 (PST)
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 762A437B41A
	for <perforce@freebsd.org>; Tue, 19 Mar 2002 02:42:18 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g2JAgIB21504
	for perforce@freebsd.org; Tue, 19 Mar 2002 02:42:18 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Tue, 19 Mar 2002 02:42:18 -0800 (PST)
Message-Id: <200203191042.g2JAgIB21504@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 7939 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=7939

Change 7939 by peter@peter_overcee on 2002/03/19 02:42:08

	Turn off ITC when in SMP mode.  It isn't sync'ed, we'll use the
	ACPI timer instead.

Affected files ...

... //depot/projects/ia64/sys/ia64/ia64/clock.c#3 edit

Differences ...

==== //depot/projects/ia64/sys/ia64/ia64/clock.c#3 (text+ko) ====

@@ -82,6 +82,7 @@
 
 extern u_int64_t itc_frequency;
 
+#ifndef SMP
 static timecounter_get_t	ia64_get_timecount;
 
 static struct timecounter ia64_timecounter = {
@@ -94,6 +95,7 @@
 
 SYSCTL_OPAQUE(_debug, OID_AUTO, ia64_timecounter, CTLFLAG_RD, 
 	&ia64_timecounter, sizeof(ia64_timecounter), "S,timecounter", "");
+#endif
 
 /* Values for timerX_state: */
 #define	RELEASED	0
@@ -187,8 +189,10 @@
 	scaled_ticks_per_cycle = ((u_int64_t)hz << FIX_SHIFT) / freq;
 	max_cycles_per_tick = 2*freq / hz;
 
+#ifndef SMP
 	ia64_timecounter.tc_frequency = freq;
 	tc_init(&ia64_timecounter);
+#endif
 
 	ia64_set_itm(ia64_get_itc() + (itc_frequency + hz/2) / hz);
 	ia64_set_itv(255);	/* highest priority class */
@@ -418,11 +422,13 @@
 	CLOCK_SET(clockdev, &ct);
 }
 
+#ifndef SMP
 static unsigned
 ia64_get_timecount(struct timecounter* tc)
 {
     return ia64_get_itc();
 }
+#endif
 
 int
 acquire_timer2(int mode)

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