x86/microcode: change type to unsigned int in few places
Subsystems (2)
PATCH 1/1 x86/microcode: change type to unsigned int in few places
The patch changes a type of variables and function prototypes to be in align with what x86_*() / __x86_*() functions return.
Signed-off-by Andy Shevchenko <[email protected]>
--- arch/x86/include/asm/microcode_amd.h | 4 ++-- arch/x86/kernel/cpu/microcode/amd_early.c | 5 +++-- arch/x86/kernel/cpu/microcode/core_early.c | 3 ++- arch/x86/kernel/cpu/microcode/intel_early.c | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-)
arch/x86/include/asm/microcode_amd.h +2 -2
@@ -65,12 +65,12 @@ extern enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, sextern u8 amd_ucode_patch[PATCH_MAX_SIZE ];#ifdef CONFIG_MICROCODE_AMD_EARLY -extern void __init load_ucode_amd_bsp (int family); +extern void __init load_ucode_amd_bsp (unsigned int family);extern void load_ucode_amd_ap (void );extern int __init save_microcode_in_initrd_amd (void );void reload_ucode_amd (void );#else -static inline void __init load_ucode_amd_bsp (int family) {} +static inline void __init load_ucode_amd_bsp (unsigned int family) {}static inline void load_ucode_amd_ap (void ) {}static inline int __init save_microcode_in_initrd_amd (void ) {return -EINVAL ; }void reload_ucode_amd (void ) {}
arch/x86/kernel/cpu/microcode/amd_early.c +3 -2
@@ -228,7 +228,8 @@ static void apply_ucode_in_initrd(void *ucode, size_t size, bool save_patch) } } -static bool __init load_builtin_amd_microcode (struct cpio_data *cp,int family) +static bool __init load_builtin_amd_microcode (struct cpio_data *cp, +unsigned int family) {#ifdef CONFIG_X86_64 char fw_name[36 ] ="amd-ucode/microcode_amd.bin" ;
@@ -243,7 +244,7 @@ static bool __init load_builtin_amd_microcode(struct cpio_data *cp, int family)#endif } -void __init load_ucode_amd_bsp (int family) +void __init load_ucode_amd_bsp (unsigned int family) {struct cpio_data cp;void **data;
arch/x86/kernel/cpu/microcode/core_early.c +2 -1
@@ -66,7 +66,8 @@ bool get_builtin_firmware(struct cpio_data *cd, const char *name)void __init load_ucode_bsp (void ) { -int vendor, family; +int vendor; +unsigned int family;if (check_loader_disabled_bsp ())return ;
arch/x86/kernel/cpu/microcode/intel_early.c +2 -2
@@ -524,8 +524,8 @@ EXPORT_SYMBOL_GPL(save_mc_for_early);static bool __init load_builtin_intel_microcode (struct cpio_data *cp) {#ifdef CONFIG_X86_64 -u32 eax =0x00000001 , ebx, ecx =0 , edx; -int family, model, stepping; +unsigned int eax =0x00000001 , ebx, ecx =0 , edx; +unsigned int family, model, stepping;char name[30 ];native_cpuid (&eax, &ebx, &ecx, &edx);
Signature · 1 line
2.1.4
Borislav Petkov
AppliedQuoted 10 lines · Andy Shevchenko
The patch changes a type of variables and function prototypes to be in align with what x86_*() / __x86_*() functions return.
Signed-off-by Andy Shevchenko <[email protected]>--- arch/x86/include/asm/microcode_amd.h | 4 ++-- arch/x86/kernel/cpu/microcode/amd_early.c | 5 +++-- arch/x86/kernel/cpu/microcode/core_early.c | 3 ++- arch/x86/kernel/cpu/microcode/intel_early.c | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-)
Applied, thanks.
Signature · 5 lines
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--