Index: kernel/arch/sparc64/Makefile.inc
===================================================================
--- kernel/arch/sparc64/Makefile.inc	(revision b352895711d138fc0695d14b25c940944f72f888)
+++ kernel/arch/sparc64/Makefile.inc	(revision cf843906d20fbb1468a1454747eb8da4292244ce)
@@ -75,5 +75,4 @@
 	arch/$(KARCH)/src/dummy.s \
 	arch/$(KARCH)/src/mm/$(USARCH)/as.c \
-	arch/$(KARCH)/src/mm/cache.S \
 	arch/$(KARCH)/src/mm/$(USARCH)/frame.c \
 	arch/$(KARCH)/src/mm/page.c \
@@ -94,4 +93,9 @@
 	arch/$(KARCH)/src/drivers/pci.c \
 	arch/$(KARCH)/src/drivers/fhc.c
+
+ifeq ($(USARCH),sun4u)
+	ARCH_SOURCES += \
+	        arch/$(KARCH)/src/mm/cache.S
+endif
 
 ifeq ($(USARCH),sun4v)
Index: kernel/arch/sparc64/include/sun4v/arch.h
===================================================================
--- kernel/arch/sparc64/include/sun4v/arch.h	(revision b352895711d138fc0695d14b25c940944f72f888)
+++ kernel/arch/sparc64/include/sun4v/arch.h	(revision cf843906d20fbb1468a1454747eb8da4292244ce)
@@ -58,9 +58,4 @@
 #define SCRATCHPAD_WBUF		0x18
 
-//MH - remove when cpu.h is forked
-#define ASI_NUCLEUS_QUAD_LDD	0x24	/** ASI for 16-byte atomic loads. */
-#define ASI_DCACHE_TAG		0x47	/** ASI D-Cache Tag. */
-#define ASI_ICBUS_CONFIG	0x4a	/** ASI of the UPA_CONFIG/FIREPLANE_CONFIG register. */
-
 #endif