PERFORCE change 136243 for review

Randall R. Stewart rrs at FreeBSD.org
Tue Feb 26 14:17:03 UTC 2008


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

Change 136243 by rrs at rrs-mips2-jnpr on 2008/02/26 14:16:06

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

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/mainbus.c#3 edit

Differences ...

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

@@ -257,6 +257,9 @@
 	/*
 	 * If this is a memory resource, map it into the kernel.
 	 */
+#ifdef TARGET_OCTEON
+         uint64_t temp;
+#endif  
 	if (rman_get_bustag(r) == MIPS_BUS_SPACE_MEM) {
 		caddr_t vaddr = 0;
 		{
@@ -271,7 +274,13 @@
 		}
 		rman_set_virtual(r, vaddr);
 		/* IBM-PC: the type of bus_space_handle_t is u_int */
+#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));
 }


More information about the p4-projects mailing list