*** NO COMMENTS ***

@@ -80,12 +80,12 @@
 #       (Such as a machine specific optimization, which preserves the
 #       interfaces.)
 #
 include $(UTSBASE)/sparc/Makefile.files
 include $(UTSBASE)/sparc/v9/Makefile.files
-include $(UTSTREE)/sun/Makefile.files
-include $(UTSTREE)/common/Makefile.files
+include $(UTSBASE)/sun/Makefile.files
+include $(UTSBASE)/common/Makefile.files
 
 #
 # ----- TRANSITIONAL SECTION --------------------------------------------------
 #
 

@@ -490,5 +490,13 @@
 
 #
 #       kiconv modules (/kernel/kiconv):
 #
 KICONV_KMODS    += kiconv_emea kiconv_ja kiconv_ko kiconv_sc kiconv_tc
+
+#
+# Ensure that the variable member of the cpu_t (cpu_m) is defined
+# for the lint builds so as not to cause lint errors during the
+# global cross check.
+#
+$(LINTFLAGSUPPRESS)LINTFLAGS    += -D_MACHDEP -I$(UTSBASE)/sun4 \
+                                   -I$(UTSBASE)/sun4u -I$(UTSBASE)/sfmmu