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

diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index d7c018526d3c77772d104295de1d647cfd0917e4..3522816f3c26502fb54ae32b135399f00e3e4818 100644 (file)
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2018 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
@@ -1207,46 +1207,6 @@ enum {
 #undef FIELD
 #undef FLAG
 
-/*
- * Legal CPUID config file mask characters.  For a description of the
- * cpuid masking system, please see:
- *
- * http://vmweb.vmware.com/~mts/cgi-bin/view.cgi/Apps/CpuMigrationChecks
- */
-
-#define CPUID_MASK_HIDE_CHR    '0'
-#define CPUID_MASK_HIDE_STR    "0"
-#define CPUID_MASK_FORCE_CHR   '1'
-#define CPUID_MASK_FORCE_STR   "1"
-#define CPUID_MASK_PASS_CHR    '-'
-#define CPUID_MASK_PASS_STR    "-"
-#define CPUID_MASK_TRUE_CHR    'T'
-#define CPUID_MASK_TRUE_STR    "T"
-#define CPUID_MASK_FALSE_CHR   'F'
-#define CPUID_MASK_FALSE_STR   "F"
-#define CPUID_MASK_IGNORE_CHR  'X'
-#define CPUID_MASK_IGNORE_STR  "X"
-#define CPUID_MASK_HOST_CHR    'H'
-#define CPUID_MASK_HOST_STR    "H"
-#define CPUID_MASK_RSVD_CHR    'R'
-#define CPUID_MASK_RSVD_STR    "R"
-
-/*
- * When LM is disabled, we overlay the following masks onto the
- * guest's default masks.  Any level that is not defined below should
- * be treated as all "-"s
- */
-
-#define CPT_ID1ECX_LM_DISABLED  "----:----:----:----:--0-:----:----:----"
-#define CPT_ID81EDX_LM_DISABLED "--0-:----:----:----:----:----:----:----"
-#define CPT_ID81ECX_LM_DISABLED "----:----:----:----:----:----:----:---0"
-
-#define CPT_GET_LM_DISABLED_MASK(lvl, reg)                                  \
-   ((lvl == 1 && reg == CPUID_REG_ECX) ? CPT_ID1ECX_LM_DISABLED :           \
-    (lvl == 0x80000001 && reg == CPUID_REG_ECX) ? CPT_ID81ECX_LM_DISABLED : \
-    (lvl == 0x80000001 && reg == CPUID_REG_EDX) ? CPT_ID81EDX_LM_DISABLED : \
-    NULL)
-
 /*
  * CPUID_MASK --
  * CPUID_SHIFT --