UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ingo Molnar 2022-03-03 08:57:08 +01:00
parent cedd3614e5
commit 02a08d78f5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/events/intel/uncore_discovery.c
View File

@ -210,7 +210,7 @@ static int parse_discovery_table(struct pci_dev *dev, int die,
void __iomem *io_addr; void __iomem *io_addr;
resource_size_t addr; resource_size_t addr;
unsigned long size; unsigned long size;
u32 val, val2; u32 val;
int i; int i;
pci_read_config_dword(dev, bar_offset, &val); 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); addr = (resource_size_t)(val & PCI_BASE_ADDRESS_MEM_MASK);
#ifdef CONFIG_PHYS_ADDR_T_64BIT #ifdef CONFIG_PHYS_ADDR_T_64BIT
if ((val & PCI_BASE_ADDRESS_MEM_TYPE_MASK) == PCI_BASE_ADDRESS_MEM_TYPE_64) { 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); pci_read_config_dword(dev, bar_offset + 4, &val2);
addr |= ((resource_size_t)val2) << 32; addr |= ((resource_size_t)val2) << 32;
} }