6310420 gcc and zuluvm don't get along

6310466 gcc wants inline SPARC assembly in the kernel

17 files changed, 324 insertions, 40 deletions

diff --git a/usr/src/pkgdefs/SUNWhea/prototype_com b/usr/src/pkgdefs/SUNWhea/prototype_com
index 831b55f249..bc000e7bca 100644
--- a/usr/src/pkgdefs/SUNWhea/prototype_com
+++ b/usr/src/pkgdefs/SUNWhea/prototype_com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -60,6 +59,9 @@ f none usr/include/arpa/nameser.h 644 root bin
 f none usr/include/arpa/nameser_compat.h 644 root bin
 f none usr/include/arpa/telnet.h 644 root bin
 f none usr/include/arpa/tftp.h 644 root bin
+d none usr/include/asm 755 root bin
+f none usr/include/asm/sunddi.h 644 root bin
+f none usr/include/asm/thread.h 644 root bin
 f none usr/include/assert.h 644 root bin
 f none usr/include/atomic.h 644 root bin
 f none usr/include/auth_attr.h 644 root bin
diff --git a/usr/src/pkgdefs/SUNWhea/prototype_i386 b/usr/src/pkgdefs/SUNWhea/prototype_i386
index f92cd8c05a..5231357244 100644
--- a/usr/src/pkgdefs/SUNWhea/prototype_i386
+++ b/usr/src/pkgdefs/SUNWhea/prototype_i386
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -49,7 +48,6 @@
 #
 # SUNWhea
 #
-d none usr/include/asm 755 root bin
 f none usr/include/asm/atomic.h 644 root bin
 f none usr/include/asm/bitmap.h 644 root bin
 f none usr/include/asm/byteorder.h 644 root bin
@@ -58,8 +56,6 @@ f none usr/include/asm/cpu.h 644 root bin
 f none usr/include/asm/cpuvar.h 644 root bin
 f none usr/include/asm/htable.h 644 root bin
 f none usr/include/asm/mmu.h 644 root bin
-f none usr/include/asm/sunddi.h 644 root bin
-f none usr/include/asm/thread.h 644 root bin
 d none usr/include/amd64 755 root bin
 d none usr/include/amd64/sys 755 root bin
 f none usr/include/amd64/sys/privregs.h 644 root bin
diff --git a/usr/src/pkgdefs/SUNWhea/prototype_sparc b/usr/src/pkgdefs/SUNWhea/prototype_sparc
index 9d78c343af..72dfb27265 100644
--- a/usr/src/pkgdefs/SUNWhea/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWhea/prototype_sparc
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -23,7 +22,7 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -49,6 +48,7 @@
 #
 # SUNWhea
 #
+f none usr/include/asm/flush.h 644 root bin
 f none usr/include/rpc/ib.h 644 root bin
 f none usr/include/sys/aflt.h 644 root bin
 d none usr/include/sys/av 755 root bin
diff --git a/usr/src/uts/common/sys/atomic.h b/usr/src/uts/common/sys/atomic.h
index f4e335f186..160fd683c0 100644
--- a/usr/src/uts/common/sys/atomic.h
+++ b/usr/src/uts/common/sys/atomic.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,6 +18,7 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -36,7 +36,8 @@
 extern "C" {
 #endif
 
-#if defined(_KERNEL) && defined(__GNUC__) && defined(_ASM_INLINES)
+#if defined(_KERNEL) && defined(__GNUC__) && defined(_ASM_INLINES) && \
+	(defined(__i386) || defined(__amd64))
 #include <asm/atomic.h>
 #endif
 
diff --git a/usr/src/uts/common/sys/bitmap.h b/usr/src/uts/common/sys/bitmap.h
index 863efa55d0..8476ba9563 100644
--- a/usr/src/uts/common/sys/bitmap.h
+++ b/usr/src/uts/common/sys/bitmap.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,8 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -31,14 +31,15 @@
 #ifndef _SYS_BITMAP_H
 #define	_SYS_BITMAP_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.6	*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #ifdef	__cplusplus
 extern "C" {
 #endif
 
 #include <sys/feature_tests.h>
-#if defined(__GNUC__) && defined(_ASM_INLINES)
+#if defined(__GNUC__) && defined(_ASM_INLINES) && \
+	(defined(__i386) || defined(__amd64))
 #include <asm/bitmap.h>
 #endif
 
diff --git a/usr/src/uts/common/sys/byteorder.h b/usr/src/uts/common/sys/byteorder.h
index 416b2d7c01..b80a0f02bd 100644
--- a/usr/src/uts/common/sys/byteorder.h
+++ b/usr/src/uts/common/sys/byteorder.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,6 +18,7 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -45,7 +45,8 @@
 #include <sys/isa_defs.h>
 #include <sys/int_types.h>
 
-#if defined(__GNUC__) && defined(_ASM_INLINES)
+#if defined(__GNUC__) && defined(_ASM_INLINES) && \
+	(defined(__i386) || defined(__amd64))
 #include <asm/byteorder.h>
 #endif
 
diff --git a/usr/src/uts/common/sys/cpuvar.h b/usr/src/uts/common/sys/cpuvar.h
index 66bdd0d0f1..91b917cfd1 100644
--- a/usr/src/uts/common/sys/cpuvar.h
+++ b/usr/src/uts/common/sys/cpuvar.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,6 +18,7 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -43,7 +43,8 @@
 #include <sys/bitmap.h>
 #include <sys/rwlock.h>
 #include <sys/msacct.h>
-#if defined(__GNUC__) && defined(_ASM_INLINES) && defined(_KERNEL)
+#if defined(__GNUC__) && defined(_ASM_INLINES) && defined(_KERNEL) && \
+	(defined(__i386) || defined(__amd64))
 #include <asm/cpuvar.h>
 #endif
 
diff --git a/usr/src/uts/sparc/Makefile b/usr/src/uts/sparc/Makefile
index 60dab88132..3f720c577e 100644
--- a/usr/src/uts/sparc/Makefile
+++ b/usr/src/uts/sparc/Makefile
@@ -88,6 +88,7 @@ $(SVVS) $(XMODS):	FRC
 	fi
 
 install_h check:	FRC
+	@cd asm; pwd; $(MAKE) $(TARGET)
 	@cd sys; pwd; $(MAKE) $(TARGET)
 	@cd v7/sys; pwd; $(MAKE) $(TARGET)
 	@cd v9/sys; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/uts/sparc/Makefile.sparc b/usr/src/uts/sparc/Makefile.sparc
index a1c76c3d26..fae5b6ded3 100644
--- a/usr/src/uts/sparc/Makefile.sparc
+++ b/usr/src/uts/sparc/Makefile.sparc
@@ -115,7 +115,7 @@ CFLAGS		+= $(XARCH)
 CFLAGS		+= $(COPTIMIZE)
 CFLAGS		+= $(EXTRA_CFLAGS)
 CFLAGS		+= $(XAOPT)
-CFLAGS		+= $(INLINES)
+CFLAGS		+= $(INLINES) -D_ASM_INLINES
 CFLAGS		+= $(CCMODE)
 CFLAGS		+= $(SPACEFLAG)
 CFLAGS		+= $(CERRWARN)
diff --git a/usr/src/uts/sparc/asm/Makefile b/usr/src/uts/sparc/asm/Makefile
new file mode 100644
index 0000000000..76bd0ea81f
--- /dev/null
+++ b/usr/src/uts/sparc/asm/Makefile
@@ -0,0 +1,57 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the 
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# include global definitions
+include ../../../Makefile.master
+
+HDRS	=			\
+	flush.h			\
+	sunddi.h		\
+	thread.h
+
+ROOTDIR=	$(ROOT)/usr/include/asm
+ROOTDIRS=	$(ROOTDIR)
+
+ROOTHDRS= $(HDRS:%=$(ROOTDIR)/%)
+
+CHECKHDRS= $(HDRS:%.h=%.check)
+
+# install rules
+$(ROOTDIR)/%: %
+	$(INS.file)
+
+.KEEP_STATE:
+
+.PARALLEL: $(CHECKHDRS) $(ROOTHDRS)
+
+install_h: $(ROOTDIRS) .WAIT $(ROOTHDRS)
+
+$(ROOTDIRS):
+	$(INS.dir)
+
+check:	$(CHECKHDRS)
diff --git a/usr/src/uts/sparc/asm/flush.h b/usr/src/uts/sparc/asm/flush.h
new file mode 100644
index 0000000000..b9e8d7e93e
--- /dev/null
+++ b/usr/src/uts/sparc/asm/flush.h
@@ -0,0 +1,60 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _ASM_FLUSH_H
+#define	_ASM_FLUSH_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <sys/types.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#if !defined(__lint) && defined(__GNUC__)
+
+extern __inline__ void
+doflush(void *addr)
+{
+#if defined(__sparcv9)
+	__asm__ __volatile__(
+	    "andn	%0, 3, %0\n\t"
+	    "flush	%0\n\t"
+	: "=r" (addr)
+	: "0" (addr));
+#else
+#error	"port me"
+#endif
+}
+
+#endif	/* !__lint && __GNUC__ */
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _ASM_FLUSH_H */
diff --git a/usr/src/uts/sparc/asm/sunddi.h b/usr/src/uts/sparc/asm/sunddi.h
new file mode 100644
index 0000000000..8ff08fbaa6
--- /dev/null
+++ b/usr/src/uts/sparc/asm/sunddi.h
@@ -0,0 +1,56 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _ASM_SUNDDI_H
+#define	_ASM_SUNDDI_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <sys/types.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#if !defined(__lint) && defined(__GNUC__)
+
+#if defined(_BOOT)
+
+extern __inline__ void
+sync_instruction_memory(caddr_t v, size_t len)
+{
+	__asm__ __volatile__("nop");
+}
+
+#endif /* _BOOT */
+
+#endif /* !__lint && __GNUC__ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _ASM_SUNDDI_H */
diff --git a/usr/src/uts/sparc/asm/thread.h b/usr/src/uts/sparc/asm/thread.h
new file mode 100644
index 0000000000..77e75e8cf0
--- /dev/null
+++ b/usr/src/uts/sparc/asm/thread.h
@@ -0,0 +1,94 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _ASM_THREAD_H
+#define	_ASM_THREAD_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <sys/types.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#if !defined(__lint) && defined(__GNUC__)
+
+struct _kthread;
+
+extern __inline__ struct _kthread *
+threadp(void)
+{
+	void *__value;
+
+#if defined(__sparcv9)
+	__asm__ __volatile__(
+	    ".register %%g7, #scratch\n\t"
+	    "mov %%g7, %0"
+	    : "=r" (__value));
+#else
+#error	"port me"
+#endif
+	return (__value);
+}
+
+extern __inline__ caddr_t
+caller(void)
+{
+	caddr_t __value;
+
+#if defined(__sparcv9)
+	__asm__ __volatile__(
+	    "mov %%i7, %0"
+	    : "=r" (__value));
+#else
+#error	"port me"
+#endif
+	return (__value);
+}
+
+extern __inline__ caddr_t
+callee(void)
+{
+	caddr_t __value;
+
+#if defined(__sparcv9)
+	__asm__ __volatile__(
+	    "mov %%o7, %0"
+	    : "=r" (__value));
+#else
+#error	"port me"
+#endif
+	return (__value);
+}
+
+#endif	/* !__lint && __GNUC__ */
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _ASM_THREAD_H */
diff --git a/usr/src/uts/sparc/sys/archsystm.h b/usr/src/uts/sparc/sys/archsystm.h
index 457a287c43..23e9797e78 100644
--- a/usr/src/uts/sparc/sys/archsystm.h
+++ b/usr/src/uts/sparc/sys/archsystm.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,8 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -42,6 +42,9 @@ extern "C" {
 #include <sys/types.h>
 #include <sys/regset.h>
 #include <sys/model.h>
+#if defined(__GNUC__) && defined(_ASM_INLINES)
+#include <asm/flush.h>
+#endif
 
 extern greg_t getfp(void);
 extern greg_t getpsr(void);
diff --git a/usr/src/uts/sun4u/Makefile.sun4u b/usr/src/uts/sun4u/Makefile.sun4u
index 1c635edc5c..bf1b28000d 100644
--- a/usr/src/uts/sun4u/Makefile.sun4u
+++ b/usr/src/uts/sun4u/Makefile.sun4u
@@ -196,7 +196,7 @@ CFLAGS		+= $(CC_XARCH)
 CFLAGS		+= $(COPTIMIZE)
 CFLAGS		+= $(EXTRA_CFLAGS)
 CFLAGS		+= $(XAOPT)
-CFLAGS		+= $(INLINES)
+CFLAGS		+= $(INLINES) -D_ASM_INLINES
 CFLAGS		+= $(CCMODE)
 CFLAGS		+= $(SPACEFLAG)
 CFLAGS		+= $(CERRWARN)
diff --git a/usr/src/uts/sun4u/zuluvm/zuluvm_offsets.in b/usr/src/uts/sun4u/zuluvm/zuluvm_offsets.in
index 3c4975a58a..14470a9274 100644
--- a/usr/src/uts/sun4u/zuluvm/zuluvm_offsets.in
+++ b/usr/src/uts/sun4u/zuluvm/zuluvm_offsets.in
@@ -35,13 +35,13 @@ zulu_hat
 	zulu_tsb_size	ZULU_HAT_TSB_SZ
 	zulu_ctx	ZULU_HAT_CTX
 
+#ifdef ZULUVM_STATS
 zuluvm_miss_t
 	idata		ZULUVM_IDATA
 	arg		ZULUVM_ARG
 	mmu_pa		ZULUVM_PAMMU
 	state		ZULUVM_STATE
 	intr_num	ZULUVM_INTRNUM
-#ifdef ZULUVM_STATS
 	cancel		ZULUVM_ST_TLBCANCEL
 	tlb_miss	ZULUVM_ST_MISS
 	pagefault	ZULUVM_ST_PGFAULT
@@ -55,10 +55,21 @@ zuluvm_miss_t
 	dtlb2miss	ZULUVM_ST_DTLB2MISS
 	demap_page	ZULUVM_ST_DEMAP_PAGE
 	demap_ctx	ZULUVM_ST_DEMAP_CTX
-#endif
 	pfnbuf		ZULUVM_PFNBUF
 	pfncnt		ZULUVM_PFNCNT
 
+#else
+
+zuluvm_miss_t
+	idata		ZULUVM_IDATA
+	arg		ZULUVM_ARG
+	mmu_pa		ZULUVM_PAMMU
+	state		ZULUVM_STATE
+	intr_num	ZULUVM_INTRNUM
+	pfnbuf		ZULUVM_PFNBUF
+	pfncnt		ZULUVM_PFNCNT
+#endif
+
 \#define ZULUVM_OFFSET(a) (ZULUVM_IDATA + ((a) * ZULUVM_IDATA_INCR))
 \#define ZULUVM_ASM_TLB_TTE	ZULUVM_OFFSET(ZULUVM_TLB_TTE_IDX)
 \#define ZULUVM_ASM_TLB_ADDR	ZULUVM_OFFSET(ZULUVM_TLB_ADDR_IDX)
diff --git a/usr/src/uts/sun4v/Makefile.sun4v b/usr/src/uts/sun4v/Makefile.sun4v
index 0e2369cce4..2b83ee5c7c 100644
--- a/usr/src/uts/sun4v/Makefile.sun4v
+++ b/usr/src/uts/sun4v/Makefile.sun4v
@@ -166,7 +166,7 @@ CFLAGS		+= $(CC_XARCH)
 CFLAGS		+= $(COPTIMIZE)
 CFLAGS		+= $(EXTRA_CFLAGS)
 CFLAGS		+= $(XAOPT)
-CFLAGS		+= $(INLINES)
+CFLAGS		+= $(INLINES) -D_ASM_INLINES
 CFLAGS		+= $(CCMODE)
 CFLAGS		+= $(SPACEFLAG)
 CFLAGS		+= $(CERRWARN)