From owner-p4-projects@FreeBSD.ORG  Tue Feb 26 14:16:01 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D625E106571B; Tue, 26 Feb 2008 14:16:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 793D210656C8
	for <perforce@freebsd.org>; Tue, 26 Feb 2008 14:16:00 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 67FBA13C45E
	for <perforce@freebsd.org>; Tue, 26 Feb 2008 14:16:00 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEG0QF046288
	for <perforce@freebsd.org>; Tue, 26 Feb 2008 14:16:00 GMT
	(envelope-from rrs@cisco.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEFx6U046282
	for perforce@freebsd.org; Tue, 26 Feb 2008 14:15:59 GMT
	(envelope-from rrs@cisco.com)
Date: Tue, 26 Feb 2008 14:15:59 GMT
Message-Id: <200802261415.m1QEFx6U046282@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rrs@cisco.com using -f
From: "Randall R. Stewart" <rrs@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 136242 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, 26 Feb 2008 14:16:01 -0000

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

Change 136242 by rrs@rrs-mips2-jnpr on 2008/02/26 14:15:35

	For octeon get rid of the warning that breaks the build.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#6 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#6 (text+ko) ====

@@ -360,7 +360,9 @@
 nexus_activate_resource(device_t bus, device_t child, int type, int rid,
     struct resource *r)
 {
-
+#ifdef TARGET_OCTEON
+        uint64_t temp;
+#endif		
 	/*
 	 * If this is a memory resource, track the direct mapping
 	 * in the uncached MIPS KSEG1 segment.
@@ -371,7 +373,13 @@
 		vaddr = (void *)MIPS_PHYS_TO_KSEG1((intptr_t)rman_get_start(r));
 		rman_set_virtual(r, vaddr);
 		rman_set_bustag(r, MIPS_BUS_SPACE_MEM);
+#ifdef TARGET_OCTEON
+		temp = 0x0000000000000000;
+		temp |= (uint32_t)vaddr;
+		rman_set_bushandle(r, (bus_space_handle_t)temp);
+#else		
 		rman_set_bushandle(r, (bus_space_handle_t)vaddr);
+#endif		
 	}
 
 	return (rman_activate_resource(r));