From owner-p4-projects@FreeBSD.ORG  Tue Feb 14 07:41:04 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 1854816A423; Tue, 14 Feb 2006 07:41:04 +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 CCA3316A420
	for <perforce@freebsd.org>; Tue, 14 Feb 2006 07:41:03 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 95D0B43D4C
	for <perforce@freebsd.org>; Tue, 14 Feb 2006 07:41:03 +0000 (GMT)
	(envelope-from kmacy@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 k1E7f3Hi069165
	for <perforce@freebsd.org>; Tue, 14 Feb 2006 07:41:03 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1E7f3I1069162
	for perforce@freebsd.org; Tue, 14 Feb 2006 07:41:03 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 14 Feb 2006 07:41:03 GMT
Message-Id: <200602140741.k1E7f3I1069162@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 91736 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: Tue, 14 Feb 2006 07:41:04 -0000

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

Change 91736 by kmacy@kmacy_storage:sun4v_work on 2006/02/14 07:40:01

	remove references to non-existent version register

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/md_var.h#2 edit
.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/identcpu.c#2 edit
.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#2 edit
.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tick.c#2 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/md_var.h#2 (text+ko) ====

@@ -54,10 +54,11 @@
 void	utrap_free(struct md_utrap *ut);
 struct md_utrap *utrap_hold(struct md_utrap *ut);
 
-cpu_block_copy_t spitfire_block_copy;
-cpu_block_zero_t spitfire_block_zero;
 
 extern	cpu_block_copy_t *cpu_block_copy;
 extern	cpu_block_zero_t *cpu_block_zero;
 
+#define UNIMPLEMENTED panic("%s not implemented", __FUNCTION__)
+
+
 #endif /* !_MACHINE_MD_VAR_H_ */

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/identcpu.c#2 (text+ko) ====

@@ -25,8 +25,6 @@
 SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD,
     cpu_model, 0, "Machine model");
 
-int cpu_impl;
-
 void setPQL2(int *const size, int *const ways);
 
 void

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#2 (text+ko) ====

@@ -284,12 +284,6 @@
 	kmdp = NULL;
 
 	/*
-	 * Find out what kind of cpu we have first, for anything that changes
-	 * behaviour.
-	 */
-	cpu_impl = VER_IMPL(rdpr(ver));
-
-	/*
 	 * Initialize Open Firmware (needed for console).
 	 */
 	OF_init(vec);

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tick.c#2 (text+ko) ====

@@ -192,8 +192,5 @@
 void
 tick_stop(void)
 {
-
-	if (cpu_impl >= CPU_IMPL_ULTRASPARCIII)
-		wr(asr25, 1L << 63, 0);
-	wrtickcmpr(1L << 63, 0);
+	UNIMPLEMENTED;
 }