PERFORCE change 136242 for review

[Randall R. Stewart]

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

Change 136242 by rrs at 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));