BHYVE: Fix vmm lint errors

"../../i86pc/io/vmm/vmm.c", line 2848: internal compiler error: Wasted space
omniosorg · Mar 1, 2018 · 5247e0a · 5247e0a
1 parent b6b02f0
commit 5247e0a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/usr/src/compat/freebsd/amd64/machine/vmparam.h b/usr/src/compat/freebsd/amd64/machine/vmparam.h
@@ -20,6 +20,13 @@
 extern caddr_t kpm_vbase;
 extern size_t kpm_size;
 
+#if defined(lint)
+
+#define	PHYS_TO_DMAP(x)	((uintptr_t)(x) | (uintptr_t)kpm_vbase)
+#define	DMAP_TO_PHYS(x)	((uintptr_t)(x) & ~(uintptr_t)kpm_vbase)
+
+#else
+
 #define	PHYS_TO_DMAP(x)	({ 			\
 	ASSERT((uintptr_t)(x) < kpm_size);	\
 	(uintptr_t)(x) | (uintptr_t)kpm_vbase; })
@@ -29,5 +36,7 @@ extern size_t kpm_size;
 	ASSERT((uintptr_t)(x) < ((uintptr_t)kpm_vbase + kpm_size));	\
 	(uintptr_t)(x) & ~(uintptr_t)kpm_vbase; })	\
 
+#endif /* lint */
+
 
 #endif	/* _COMPAT_FREEBSD_AMD64_MACHINE_VMPARAM_H_ */
diff --git a/usr/src/uts/i86pc/Makefile.rules b/usr/src/uts/i86pc/Makefile.rules
@@ -501,6 +501,9 @@ $(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/vmm/intel/%.c
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/vmm/io/%.c
 	@($(LHEAD) $(LINT.c) $< $(LTAIL))
 
+$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/vmm/amd/%.s
+	@($(LHEAD) $(LINT.s) $< $(LTAIL))
+
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/vmm/intel/%.s
 	@($(LHEAD) $(LINT.s) $< $(LTAIL))
 

diff --git a/usr/src/uts/i86pc/io/vmm/amd/svm_support.s b/usr/src/uts/i86pc/io/vmm/amd/svm_support.s
@@ -27,7 +27,6 @@
  */
 #include <machine/asmacros.h>
 
-#include "svm_assym.h"
 
 /* Porting note: This is named 'svm_support.S' upstream. */
 
@@ -43,6 +42,8 @@ svm_launch(uint64_t pa, struct svm_regctx *gctx, struct pcpu *pcpu)
 
 #else /* lint */
 
+#include "svm_assym.h"
+
 /*
  * Be friendly to DTrace FBT's prologue/epilogue pattern matching.
  *