From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 26 Aug 2021 07:14:05 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core, to pick up fixes
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=46466ae3a105d9620e1355e33125a413b8c6ce18;p=linux.git

Merge branch 'perf/urgent' into perf/core, to pick up fixes

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

46466ae3a105d9620e1355e33125a413b8c6ce18
diff --cc arch/x86/events/intel/uncore_snbep.c
index f665b163cb29d,c682b09b18fa0..5ddc0f30db6fc
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@@ -4831,10 -4808,10 +4835,10 @@@ static int snr_uncore_mmio_map(struct i
  	u32 pci_dword;
  
  	if (!pdev)
 -		return;
 +		return -ENODEV;
  
  	pci_read_config_dword(pdev, SNR_IMC_MMIO_BASE_OFFSET, &pci_dword);
- 	addr = (pci_dword & SNR_IMC_MMIO_BASE_MASK) << 23;
+ 	addr = ((resource_size_t)pci_dword & SNR_IMC_MMIO_BASE_MASK) << 23;
  
  	pci_read_config_dword(pdev, mem_offset, &pci_dword);
  	addr |= (pci_dword & SNR_IMC_MMIO_MEM0_MASK) << 12;