From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754812AbaCKKnt (ORCPT ); Tue, 11 Mar 2014 06:43:49 -0400 Received: from mail-wg0-f47.google.com ([74.125.82.47]:38772 "EHLO mail-wg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752717AbaCKKns (ORCPT ); Tue, 11 Mar 2014 06:43:48 -0400 Date: Tue, 11 Mar 2014 11:44:33 +0100 From: Stephane Eranian To: linux-kernel@vger.kernel.org Cc: peterz@infradead.org, mingo@elte.hu, sfr@canb.auug.org.au, hpa@zytor.com, tglx@linuxtronic.de Subject: [PATCH] perf/x86/uncore: fix compilation warning in snb_uncore_imc_init_box() Message-ID: <20140311104433.GA16207@quad> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patches fixes a compilation problem (unused variable) with the new SNB/IVB/HSW uncore IMC code. Reported-by: Stephen Rothwell Signed-off-by: Stephane Eranian diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c index b262c61..3846a37 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c @@ -1722,15 +1722,19 @@ static struct attribute_group snb_uncore_imc_format_group = { static void snb_uncore_imc_init_box(struct intel_uncore_box *box) { struct pci_dev *pdev = box->pci_dev; - u32 addr_lo, addr_hi; + u32 addr_lo; resource_size_t addr; pci_read_config_dword(pdev, SNB_UNCORE_PCI_IMC_BAR_OFFSET, &addr_lo); addr = addr_lo; #ifdef CONFIG_PHYS_ADDR_T_64BIT - pci_read_config_dword(pdev, SNB_UNCORE_PCI_IMC_BAR_OFFSET+4, &addr_hi); - addr = ((resource_size_t)addr_hi << 32) | addr_lo; + { u32 addr_hi; + int where = SNB_UNCORE_PCI_IMC_BAR_OFFSET + 4; + + pci_read_config_dword(pdev, where, &addr_hi); + addr = ((resource_size_t)addr_hi << 32) | addr_lo; + } #endif addr &= ~(PAGE_SIZE - 1);