From: VMware, Inc <>
Date: Thu, 17 Jun 2010 21:17:24 +0000 (-0700)
Subject: vmmemctl: use Solaris kernel native ASSERT
X-Git-Tag: 2010.06.16-268169~148
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48b0ec0dce6c81e75bfcaa70ca8388b81eae9251;p=thirdparty%2Fopen-vm-tools.git

vmmemctl: use Solaris kernel native ASSERT

Do not include vm_assert.h in the kernel driver code and instead
rely on kernel-provided ASSERT (which does not require Panic()
and others).

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/modules/solaris/vmmemctl/os.c b/open-vm-tools/modules/solaris/vmmemctl/os.c
index 1db2d5d7c..b3d680d60 100644
--- a/open-vm-tools/modules/solaris/vmmemctl/os.c
+++ b/open-vm-tools/modules/solaris/vmmemctl/os.c
@@ -39,7 +39,6 @@
 
 #include "os.h"
 #include "vmballoon.h"
-#include "vm_assert.h"
 #include "balloon_def.h"
 #include "vmballoon_kstats.h"
 #include "vmmemctl.h"