From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932494AbbFGRqP (ORCPT ); Sun, 7 Jun 2015 13:46:15 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57554 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751896AbbFGRqB (ORCPT ); Sun, 7 Jun 2015 13:46:01 -0400 Date: Sun, 7 Jun 2015 10:45:28 -0700 From: tip-bot for Andy Shevchenko Message-ID: Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, andriy.shevchenko@linux.intel.com, mingo@kernel.org, bp@suse.de, tglx@linutronix.de, hpa@zytor.com, peterz@infradead.org Reply-To: torvalds@linux-foundation.org, andriy.shevchenko@linux.intel.com, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, peterz@infradead.org, bp@suse.de, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com In-Reply-To: <1433436928-31903-21-git-send-email-bp@alien8.de> References: <1433436928-31903-21-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/microcode] x86/microcode: Correct CPU family related variable types Git-Commit-ID: 7b179b8feba3b887be5ddd501c25d924cf44d70a X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 7b179b8feba3b887be5ddd501c25d924cf44d70a Gitweb: http://git.kernel.org/tip/7b179b8feba3b887be5ddd501c25d924cf44d70a Author: Andy Shevchenko AuthorDate: Thu, 4 Jun 2015 18:55:28 +0200 Committer: Ingo Molnar CommitDate: Sun, 7 Jun 2015 15:38:15 +0200 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 Signed-off-by: Borislav Petkov Cc: Andrew Morton Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1433436928-31903-21-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- 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(-) diff --git a/arch/x86/include/asm/microcode_amd.h b/arch/x86/include/asm/microcode_amd.h index b843854..ac6d328 100644 --- a/arch/x86/include/asm/microcode_amd.h +++ b/arch/x86/include/asm/microcode_amd.h @@ -65,12 +65,12 @@ extern enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, s extern 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) {} diff --git a/arch/x86/kernel/cpu/microcode/amd_early.c b/arch/x86/kernel/cpu/microcode/amd_early.c index 9243cd8..e8a215a 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 979ca78..8ebc421 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 b4858d8..8187b72 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);