From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 3 Mar 2022 07:57:08 +0000 (+0100)
Subject: perf/x86/intel/uncore: Fix the build on !CONFIG_PHYS_ADDR_T_64BIT
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=02a08d78f5c429c7dc8e5b9417b4efb518b3d041;p=linux.git

perf/x86/intel/uncore: Fix the build on !CONFIG_PHYS_ADDR_T_64BIT

'val2' is unused if !CONFIG_PHYS_ADDR_T_64BIT:

  arch/x86/events/intel/uncore_discovery.c:213:18: error: unused variable ‘val2’ [-Werror=unused-variable]

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

diff --git a/arch/x86/events/intel/uncore_discovery.c b/arch/x86/events/intel/uncore_discovery.c
index 61185d16fba26..5fd72d4b8bbb0 100644
--- a/arch/x86/events/intel/uncore_discovery.c
+++ b/arch/x86/events/intel/uncore_discovery.c
@@ -210,7 +210,7 @@ static int parse_discovery_table(struct pci_dev *dev, int die,
 	void __iomem *io_addr;
 	resource_size_t addr;
 	unsigned long size;
-	u32 val, val2;
+	u32 val;
 	int i;
 
 	pci_read_config_dword(dev, bar_offset, &val);
@@ -221,6 +221,8 @@ static int parse_discovery_table(struct pci_dev *dev, int die,
 	addr = (resource_size_t)(val & PCI_BASE_ADDRESS_MEM_MASK);
 #ifdef CONFIG_PHYS_ADDR_T_64BIT
 	if ((val & PCI_BASE_ADDRESS_MEM_TYPE_MASK) == PCI_BASE_ADDRESS_MEM_TYPE_64) {
+		u32 val2;
+
 		pci_read_config_dword(dev, bar_offset + 4, &val2);
 		addr |= ((resource_size_t)val2) << 32;
 	}