Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87449d94 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Greg Kroah-Hartman
Browse files

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



commit ba5bade4cc0d2013cdf5634dae554693c968a090 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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lkml.kernel.org/r/20200320131508.736205164@linutronix.de


Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fbd29b75

arch/x86/include/asm/cpu_device_id.h

+12 −1
Original line number Diff line number Diff line
@@ -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.

 *

arch/x86/kvm/svm.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <asm/kvm_para.h>

#include <asm/irq_remapping.h>

#include <asm/spec-ctrl.h>

#include <asm/cpu_device_id.h>



#include <asm/virtext.h>

#include "trace.h"

arch/x86/kvm/vmx/vmx.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <asm/apic.h>

#include <asm/asm.h>

#include <asm/cpu.h>

#include <asm/cpu_device_id.h>

#include <asm/debugreg.h>

#include <asm/desc.h>

#include <asm/fpu/internal.h>

drivers/cpufreq/acpi-cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,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");

drivers/cpufreq/amd_freq_sensitivity.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <asm/msr.h>

#include <asm/cpufeature.h>

#include <asm/cpu_device_id.h>



#include "cpufreq_ondemand.h"