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

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

diff --cc arch/x86/events/intel/uncore_snbep.c
index f665b16,c682b09..5ddc0f3
--- 1/arch/x86/events/intel/uncore_snbep.c
--- 2/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;