From: VMware, Inc <>
Date: Wed, 18 Sep 2013 03:41:07 +0000 (-0700)
Subject: Remove ASSERT_OR_IN_PANIC() from public/vm_assert.h
X-Git-Tag: 2013.09.16-1328054~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9200b341b7612be273c4402a3381e507766e526;p=thirdparty%2Fopen-vm-tools.git

Remove ASSERT_OR_IN_PANIC() from public/vm_assert.h

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---

diff --git a/open-vm-tools/lib/include/vm_assert.h b/open-vm-tools/lib/include/vm_assert.h
index be8c6d420..d311749b9 100644
--- a/open-vm-tools/lib/include/vm_assert.h
+++ b/open-vm-tools/lib/include/vm_assert.h
@@ -208,10 +208,6 @@ EXTERN void WarningThrottled(uint32 *count, const char *fmt, ...)
 #define PANIC()        _ASSERT_PANIC(AssertPanic)
 #define PANIC_BUG(bug) _ASSERT_PANIC_BUG(bug, AssertPanic)
 
-#ifdef VMKERNEL
-#define ASSERT_OR_IN_PANIC(cond) ASSERT((cond) || Panic_IsSystemInPanic())
-#endif
-
 #define ASSERT_NOT_IMPLEMENTED(cond) \
            ASSERT_IFNOT(cond, NOT_IMPLEMENTED())
 #define ASSERT_NOT_IMPLEMENTED_BUG(bug, cond) \