From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 11 Sep 2020 19:11:02 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.2.0~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2404fe3a2dfc88b118bd8dcf3655a960b52c822;p=thirdparty%2Fopen-vm-tools.git

Common header file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/vm_assert.h b/open-vm-tools/lib/include/vm_assert.h
index bb18cdc97..a3e7a93bc 100644
--- a/open-vm-tools/lib/include/vm_assert.h
+++ b/open-vm-tools/lib/include/vm_assert.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2020 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -224,8 +224,15 @@ void WarningThrottled(uint32 *count, const char *fmt, ...) PRINTF_DECL(2, 3);
 #define NOT_REACHED()            _ASSERT_PANIC(AssertNotReached)
 #endif
 
+#if !defined VMKERNEL && !defined VMKBOOT && !defined VMKERNEL_MODULE
+/*
+ * PR 2621164,2624036: ASSERT_MEM_ALLOC is deprecated and should not be
+ * used. Please use VERIFY where applicable, since the latter aligns
+ * better with the consistency model as defined by bora/doc/assert.
+ */
 #define ASSERT_MEM_ALLOC(cond) \
            ASSERT_IFNOT(cond, _ASSERT_PANIC(AssertMemAlloc))
+#endif
 
 #ifdef VMX86_DEVEL
 #define NOT_TESTED()       Warning(_AssertNotTestedFmt "\n", __FILE__, __LINE__)