diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2015-06-04 18:55:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-07 15:38:15 +0200 |
| commit | 7b179b8feba3b887be5ddd501c25d924cf44d70a (patch) | |
| tree | 598c1af33963764094ecb2658a1074c583216bb9 /arch/x86/kernel/cpu/microcode | |
| parent | ee38a90709084b1c91279cde8f783e90f85285a1 (diff) | |
| download | linux-7b179b8feba3b887be5ddd501c25d924cf44d70a.tar.bz2 | |
x86/microcode: Correct CPU family related variable types
Change the type of variables and function prototypes to be in
alignment with what the x86_*() / __x86_*() family/model
functions return.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1433436928-31903-21-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/microcode')
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/amd_early.c | 5 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/core_early.c | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/intel_early.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/arch/x86/kernel/cpu/microcode/amd_early.c b/arch/x86/kernel/cpu/microcode/amd_early.c index 9243cd839829..e8a215a9a345 100644 --- a/arch/x86/kernel/cpu/microcode/amd_early.c +++ b/arch/x86/kernel/cpu/microcode/amd_early.c @@ -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; diff --git a/arch/x86/kernel/cpu/microcode/core_early.c b/arch/x86/kernel/cpu/microcode/core_early.c index 979ca78b1561..8ebc421d6299 100644 --- a/arch/x86/kernel/cpu/microcode/core_early.c +++ b/arch/x86/kernel/cpu/microcode/core_early.c @@ -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; diff --git a/arch/x86/kernel/cpu/microcode/intel_early.c b/arch/x86/kernel/cpu/microcode/intel_early.c index b4858d892592..8187b7247d1c 100644 --- a/arch/x86/kernel/cpu/microcode/intel_early.c +++ b/arch/x86/kernel/cpu/microcode/intel_early.c @@ -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); |