mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-24 14:54:49 +08:00
x86/microcode: Include vendor headers into microcode.h
Currently vendor specific headers are included explicitly when used in common code. Instead, include the vendor specific headers in microcode.h, and include that in all usages. No functional change. Suggested-by: Boris Petkov <bp@alien8.de> Signed-off-by: Ashok Raj <ashok.raj@intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/20230812195727.776541545@linutronix.de
This commit is contained in:
parent
4da2131fac
commit
82ad097b02
@ -2,10 +2,13 @@
|
||||
#ifndef _ASM_X86_MICROCODE_H
|
||||
#define _ASM_X86_MICROCODE_H
|
||||
|
||||
#include <asm/cpu.h>
|
||||
#include <linux/earlycpio.h>
|
||||
#include <linux/initrd.h>
|
||||
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/microcode_amd.h>
|
||||
#include <asm/microcode_intel.h>
|
||||
|
||||
struct ucode_patch {
|
||||
struct list_head plist;
|
||||
void *data; /* Intel uses only this one */
|
||||
|
@ -2,8 +2,6 @@
|
||||
#ifndef _ASM_X86_MICROCODE_AMD_H
|
||||
#define _ASM_X86_MICROCODE_AMD_H
|
||||
|
||||
#include <asm/microcode.h>
|
||||
|
||||
#define UCODE_MAGIC 0x00414d44
|
||||
#define UCODE_EQUIV_CPU_TABLE_TYPE 0x00000000
|
||||
#define UCODE_UCODE_TYPE 0x00000001
|
||||
|
@ -2,8 +2,6 @@
|
||||
#ifndef _ASM_X86_MICROCODE_INTEL_H
|
||||
#define _ASM_X86_MICROCODE_INTEL_H
|
||||
|
||||
#include <asm/microcode.h>
|
||||
|
||||
struct microcode_header_intel {
|
||||
unsigned int hdrver;
|
||||
unsigned int rev;
|
||||
|
@ -59,7 +59,6 @@
|
||||
#include <asm/cacheinfo.h>
|
||||
#include <asm/memtype.h>
|
||||
#include <asm/microcode.h>
|
||||
#include <asm/microcode_intel.h>
|
||||
#include <asm/intel-family.h>
|
||||
#include <asm/cpu_device_id.h>
|
||||
#include <asm/uv/uv.h>
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include <asm/bugs.h>
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/intel-family.h>
|
||||
#include <asm/microcode_intel.h>
|
||||
#include <asm/microcode.h>
|
||||
#include <asm/hwcap2.h>
|
||||
#include <asm/elf.h>
|
||||
#include <asm/cpu_device_id.h>
|
||||
|
@ -29,7 +29,6 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/pci.h>
|
||||
|
||||
#include <asm/microcode_amd.h>
|
||||
#include <asm/microcode.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/setup.h>
|
||||
|
@ -31,9 +31,7 @@
|
||||
#include <linux/fs.h>
|
||||
#include <linux/mm.h>
|
||||
|
||||
#include <asm/microcode_intel.h>
|
||||
#include <asm/cpu_device_id.h>
|
||||
#include <asm/microcode_amd.h>
|
||||
#include <asm/perf_event.h>
|
||||
#include <asm/microcode.h>
|
||||
#include <asm/processor.h>
|
||||
|
@ -30,9 +30,9 @@
|
||||
#include <linux/uio.h>
|
||||
#include <linux/mm.h>
|
||||
|
||||
#include <asm/microcode_intel.h>
|
||||
#include <asm/intel-family.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/microcode.h>
|
||||
#include <asm/tlbflush.h>
|
||||
#include <asm/setup.h>
|
||||
#include <asm/msr.h>
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
#include <linux/firmware.h>
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/microcode_intel.h>
|
||||
#include <asm/microcode.h>
|
||||
|
||||
#include "ifs.h"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user