From owner-p4-projects@FreeBSD.ORG  Wed Jun 21 07:09:48 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 C7DBC16A47B; Wed, 21 Jun 2006 07:09:48 +0000 (UTC)
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 A48F316A474
	for <perforce@freebsd.org>; Wed, 21 Jun 2006 07:09:48 +0000 (UTC)
	(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 5EB3F43D46
	for <perforce@freebsd.org>; Wed, 21 Jun 2006 07:09:48 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5L79mub034313
	for <perforce@freebsd.org>; Wed, 21 Jun 2006 07:09:48 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5L79mtE034310
	for perforce@freebsd.org; Wed, 21 Jun 2006 07:09:48 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 21 Jun 2006 07:09:48 GMT
Message-Id: <200606210709.k5L79mtE034310@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 99725 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: Wed, 21 Jun 2006 07:09:49 -0000

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

Change 99725 by kmacy@kmacy_storage:sun4v_work on 2006/06/21 07:08:57

	fix KTR compile by undoing sparc64 specific define

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/ktr.h#2 edit

Differences ...

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

@@ -38,8 +38,8 @@
 
 #ifndef LOCORE
 
-#define	KTR_CPU	UPA_CR_GET_MID(ldxa(0, ASI_UPA_CONFIG_REG))
-
+#define	KTR_CPU	PCPU_GET(cpuid)
+	
 #else
 
 #define	AND(var, mask, r1, r2) \