diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c index 21a85000e828614e5a977e301478b2b52a5c383c..52954e9fa213f9afe494b0b69972896a0dd31370 100644 --- a/arch/x86/events/amd/uncore.c +++ b/arch/x86/events/amd/uncore.c @@ -790,10 +790,10 @@ static int amd_uncore_l3_event_init(struct perf_event *event) else if (boot_cpu_data.x86_vendor == X86_VENDOR_HYGON && boot_cpu_data.x86 == 0x18) { if (boot_cpu_data.x86_model >= 0x6 && boot_cpu_data.x86_model <= 0xf) - return ((config & HYGON_L3_SLICE_MASK) ? : HYGON_L3_SLICE_MASK) | + mask = ((config & HYGON_L3_SLICE_MASK) ? : HYGON_L3_SLICE_MASK) | ((config & HYGON_L3_THREAD_MASK) ? : HYGON_L3_THREAD_MASK); else - return ((config & AMD64_L3_SLICE_MASK) ? : AMD64_L3_SLICE_MASK) | + mask = ((config & AMD64_L3_SLICE_MASK) ? : AMD64_L3_SLICE_MASK) | ((config & AMD64_L3_THREAD_MASK) ? : AMD64_L3_THREAD_MASK); }