diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-05-01 19:51:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-05-01 19:51:19 +0200 |
| commit | f2940b6c9e7de0dcc4d349299603595b9d9fa503 (patch) | |
| tree | 390e4a27ce6afa4f08d83bafa37b6cbd7d4eadcf | |
| parent | 1531085426288cc28f7b4cfcb0195b67669a5494 (diff) | |
| parent | 3287c22957b401903e4933a81eea9191788da33b (diff) | |
| download | tip-f2940b6c9e7de0dcc4d349299603595b9d9fa503.tar.gz | |
Merge branch into tip/master: 'x86/microcode'
Notice: this object is not reachable from any branch.
# New commits in x86/microcode:
3287c22957b4 ("x86/microcode/AMD: Remove unused PATCH_MAX_SIZE macro")
9e11fc78e2df ("x86/microcode/AMD: Avoid -Wformat warning with clang-15")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Notice: this object is not reachable from any branch.
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/amd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index 13b45b9c806dae..c0d56c02b8da9f 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -84,8 +84,6 @@ struct microcode_amd { unsigned int mpb[]; }; -#define PATCH_MAX_SIZE (3 * PAGE_SIZE) - static struct equiv_cpu_table { unsigned int num_entries; struct equiv_cpu_entry *entry; @@ -465,7 +463,7 @@ static bool early_apply_microcode(u32 cpuid_1_eax, u32 old_rev, void *ucode, siz return !__apply_microcode_amd(mc); } -static bool get_builtin_microcode(struct cpio_data *cp, unsigned int family) +static bool get_builtin_microcode(struct cpio_data *cp, u8 family) { char fw_name[36] = "amd-ucode/microcode_amd.bin"; struct firmware fw; |