Skip to content

Commit a1907cc

Browse files
committed
Merge tag 'x86_microcode_for_v6.10_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 microcode loader updates from Borislav Petkov: - Fix a clang-15 build warning and other cleanups * tag 'x86_microcode_for_v6.10_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/microcode: Remove unused struct cpu_info_ctx x86/microcode/AMD: Remove unused PATCH_MAX_SIZE macro x86/microcode/AMD: Avoid -Wformat warning with clang-15
2 parents 5186ba3 + 57f6d0a commit a1907cc

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

arch/x86/kernel/cpu/microcode/amd.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ struct microcode_amd {
8484
unsigned int mpb[];
8585
};
8686

87-
#define PATCH_MAX_SIZE (3 * PAGE_SIZE)
88-
8987
static struct equiv_cpu_table {
9088
unsigned int num_entries;
9189
struct equiv_cpu_entry *entry;
@@ -465,7 +463,7 @@ static bool early_apply_microcode(u32 cpuid_1_eax, u32 old_rev, void *ucode, siz
465463
return !__apply_microcode_amd(mc);
466464
}
467465

468-
static bool get_builtin_microcode(struct cpio_data *cp, unsigned int family)
466+
static bool get_builtin_microcode(struct cpio_data *cp, u8 family)
469467
{
470468
char fw_name[36] = "amd-ucode/microcode_amd.bin";
471469
struct firmware fw;

arch/x86/kernel/cpu/microcode/core.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ module_param(force_minrev, bool, S_IRUSR | S_IWUSR);
6060
*/
6161
struct ucode_cpu_info ucode_cpu_info[NR_CPUS];
6262

63-
struct cpu_info_ctx {
64-
struct cpu_signature *cpu_sig;
65-
int err;
66-
};
67-
6863
/*
6964
* Those patch levels cannot be updated to newer ones and thus should be final.
7065
*/

0 commit comments

Comments
 (0)