| From 2cb8b2acde9fd3a2bd9b4c23a38358658217c39d Mon Sep 17 00:00:00 2001 |
| From: Qian Cai <cai@lca.pw> |
| Date: Mon, 8 Jul 2019 17:36:45 -0400 |
| Subject: x86/apic: Silence -Wtype-limits compiler warnings |
| |
| [ Upstream commit ec6335586953b0df32f83ef696002063090c7aef ] |
| |
| There are many compiler warnings like this, |
| |
| In file included from ./arch/x86/include/asm/smp.h:13, |
| from ./arch/x86/include/asm/mmzone_64.h:11, |
| from ./arch/x86/include/asm/mmzone.h:5, |
| from ./include/linux/mmzone.h:969, |
| from ./include/linux/gfp.h:6, |
| from ./include/linux/mm.h:10, |
| from arch/x86/kernel/apic/io_apic.c:34: |
| arch/x86/kernel/apic/io_apic.c: In function 'check_timer': |
| ./arch/x86/include/asm/apic.h:37:11: warning: comparison of unsigned |
| expression >= 0 is always true [-Wtype-limits] |
| if ((v) <= apic_verbosity) \ |
| ^~ |
| arch/x86/kernel/apic/io_apic.c:2160:2: note: in expansion of macro |
| 'apic_printk' |
| apic_printk(APIC_QUIET, KERN_INFO "..TIMER: vector=0x%02X " |
| ^~~~~~~~~~~ |
| ./arch/x86/include/asm/apic.h:37:11: warning: comparison of unsigned |
| expression >= 0 is always true [-Wtype-limits] |
| if ((v) <= apic_verbosity) \ |
| ^~ |
| arch/x86/kernel/apic/io_apic.c:2207:4: note: in expansion of macro |
| 'apic_printk' |
| apic_printk(APIC_QUIET, KERN_ERR "..MP-BIOS bug: " |
| ^~~~~~~~~~~ |
| |
| APIC_QUIET is 0, so silence them by making apic_verbosity type int. |
| |
| Signed-off-by: Qian Cai <cai@lca.pw> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Link: https://lkml.kernel.org/r/1562621805-24789-1-git-send-email-cai@lca.pw |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/x86/include/asm/apic.h | 2 +- |
| arch/x86/kernel/apic/apic.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h |
| index 2188b5af81676..f39fd349cef65 100644 |
| --- a/arch/x86/include/asm/apic.h |
| +++ b/arch/x86/include/asm/apic.h |
| @@ -50,7 +50,7 @@ static inline void generic_apic_probe(void) |
| |
| #ifdef CONFIG_X86_LOCAL_APIC |
| |
| -extern unsigned int apic_verbosity; |
| +extern int apic_verbosity; |
| extern int local_apic_timer_c2_ok; |
| |
| extern int disable_apic; |
| diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c |
| index 4f2af1ee09cbe..cc9a6f680225e 100644 |
| --- a/arch/x86/kernel/apic/apic.c |
| +++ b/arch/x86/kernel/apic/apic.c |
| @@ -183,7 +183,7 @@ int first_system_vector = FIRST_SYSTEM_VECTOR; |
| /* |
| * Debug level, exported for io_apic.c |
| */ |
| -unsigned int apic_verbosity; |
| +int apic_verbosity; |
| |
| int pic_mode; |
| |
| -- |
| 2.20.1 |
| |