From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 20 Mar 2020 14:14:07 +0100
Subject: x86/cpu: Cleanup the now unused CPU match macros
Git-commit: 1826d56bcef9c38287f7c1a8e3b7778863e0b9d7
Patch-mainline: v5.7-rc1
References: bsc#1154824 CVE-2020-0543

No more users.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lkml.kernel.org/r/20200320131510.900226233@linutronix.de
---
 arch/x86/include/asm/cpu_device_id.h |  3 ---
 arch/x86/include/asm/intel-family.h  | 13 -------------
 2 files changed, 16 deletions(-)

diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h
index f11770fac73a..cf3d621c6892 100644
--- a/arch/x86/include/asm/cpu_device_id.h
+++ b/arch/x86/include/asm/cpu_device_id.h
@@ -88,9 +88,6 @@
 #define X86_MATCH_FEATURE(feature, data)                               \
        X86_MATCH_VENDOR_FEATURE(ANY, feature, data)
 
-/* Transitional to keep the existing code working */
-#define X86_FEATURE_MATCH(feature)     X86_MATCH_FEATURE(feature, NULL)
-
 /**
  * X86_MATCH_VENDOR_FAM_MODEL - Match vendor, family and model
  * @vendor:    The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY