mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

x86/devicetable: Move x86 specific macro out of generic code 

commit ba5bade4cc upstream

There is no reason that this gunk is in a generic header file. The wildcard
defines need to stay as they are required by file2alias.

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/20200320131508.736205164@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Thomas Gleixner 2022-10-27 13:54:30 -07:00 committed by Greg Kroah-Hartman
parent fe33a42c04
commit 4b18dc820f
6 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86/include/asm/cpu_device_id.h
View File

@ -6,9 +6,20 @@
* Declare drivers belonging to specific x86 CPUs
* Similar in spirit to pci_device_id and related PCI functions
*/
#include <linux/mod_devicetable.h>
/*
* The wildcard initializers are in mod_devicetable.h because
* file2alias needs them. Sigh.
*/
#define X86_FEATURE_MATCH(x) { \
.vendor = X86_VENDOR_ANY, \
.family = X86_FAMILY_ANY, \
.model = X86_MODEL_ANY, \
.feature = x, \
}
/*
* Match specific microcode revisions.
*

1
arch/x86/kvm/svm.c
View File

@ -47,6 +47,7 @@
#include <asm/irq_remapping.h>
#include <asm/microcode.h>
#include <asm/spec-ctrl.h>
#include <asm/cpu_device_id.h>
#include <asm/virtext.h>
#include "trace.h"

1
arch/x86/kvm/vmx.c
View File

@ -40,6 +40,7 @@
#include "x86.h"
#include <asm/cpu.h>
#include <asm/cpu_device_id.h>
#include <asm/io.h>
#include <asm/desc.h>
#include <asm/vmx.h>

1
drivers/cpufreq/acpi-cpufreq.c
View File

@ -47,6 +47,7 @@
#include <asm/msr.h>
#include <asm/processor.h>
#include <asm/cpufeature.h>
#include <asm/cpu_device_id.h>
MODULE_AUTHOR("Paul Diefenbaugh, Dominik Brodowski");
MODULE_DESCRIPTION("ACPI Processor P-States Driver");

1
drivers/cpufreq/amd_freq_sensitivity.c
View File

@ -20,6 +20,7 @@
#include <asm/msr.h>
#include <asm/cpufeature.h>
#include <asm/cpu_device_id.h>
#include "cpufreq_ondemand.h"

4
include/linux/mod_devicetable.h
View File

@ -599,9 +599,7 @@ struct x86_cpu_id {
kernel_ulong_t driver_data;
};
#define X86_FEATURE_MATCH(x) \
{ X86_VENDOR_ANY, X86_FAMILY_ANY, X86_MODEL_ANY, x }
/* Wild cards for x86_cpu_id::vendor, family, model and feature */
#define X86_VENDOR_ANY 0xffff
#define X86_FAMILY_ANY 0
#define X86_MODEL_ANY 0