Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752801Ab0KGTxj (ORCPT ); Sun, 7 Nov 2010 14:53:39 -0500 Received: from one.firstfloor.org ([213.235.205.2]:34523 "EHLO one.firstfloor.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751747Ab0KGTxh (ORCPT ); Sun, 7 Nov 2010 14:53:37 -0500 From: Andi Kleen To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, Andi Kleen , x86@kernel.org Subject: [PATCH] x86: fix apic.h unused but set warnings Date: Sun, 7 Nov 2010 20:53:26 +0100 Message-Id: <1289159606-17417-1-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 1.7.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2016 Lines: 66 From: Andi Kleen [Andrew, can you please put this in your tree for submission. This was submitted some time ago, but x86@ is a blackhole unfortunately and this warnings really makes gcc 4.6 extremly noisy.] Fix linux-2.6/arch/x86/include/asm/apic.h: In function 'native_apic_msr_read': linux-2.6/arch/x86/include/asm/apic.h:144:11: warning: variable 'high' set but not used [-Wunused-but-set-variable] linux-2.6/arch/x86/include/asm/apic.h: In function 'x2apic_enabled': linux-2.6/arch/x86/include/asm/apic.h:184:11: warning: variable 'msr2' set but not used [-Wunused-but-set-variable] which happen with a gcc 4.6 build Since this is in a frequently included header these warnings are printed very frequently and make a gcc 4.6 build very noisy. Cc: x86@kernel.org Signed-off-by: Andi Kleen --- arch/x86/include/asm/apic.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 286de34..9c4e06b 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -141,12 +141,12 @@ static inline void native_apic_msr_write(u32 reg, u32 v) static inline u32 native_apic_msr_read(u32 reg) { - u32 low, high; + u32 low; if (reg == APIC_DFR) return -1; - rdmsr(APIC_BASE_MSR + (reg >> 4), low, high); + rdmsrl(APIC_BASE_MSR + (reg >> 4), low); return low; } @@ -181,12 +181,12 @@ extern void enable_x2apic(void); extern void x2apic_icr_write(u32 low, u32 id); static inline int x2apic_enabled(void) { - int msr, msr2; + int msr; if (!cpu_has_x2apic) return 0; - rdmsr(MSR_IA32_APICBASE, msr, msr2); + rdmsrl(MSR_IA32_APICBASE, msr); if (msr & X2APIC_ENABLE) return 1; return 0; -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/