The following commit has been merged into the perf/core branch of tip:
Commit-ID: 02a08d78f5c429c7dc8e5b9417b4efb518b3d041
Gitweb: https://git.kernel.org/tip/02a08d78f5c429c7dc8e5b9417b4efb518b3d041
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Thu, 03 Mar 2022 08:57:08 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Thu, 03 Mar 2022 08:58:22 +01:00
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>
---
arch/x86/events/intel/uncore_discovery.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/x86/events/intel/uncore_discovery.c b/arch/x86/events/intel/uncore_discovery.c
index 61185d1..5fd72d4 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;
}