tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

perf/x86/amd/uncore: Rename cpufeatures macro for cache counters

In Family 17h, L3 is the last level cache as opposed to L2 in previous
families. Avoid this name confusion and rename X86_FEATURE_PERFCTR_L2 to
X86_FEATURE_PERFCTR_LLC to indicate the performance counter on the last
level of cache.

Signed-off-by: Janakarajan Natarajan <Janakarajan.Natarajan@amd.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Borislav Petkov <bp@suse.de>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/016311029fdecdc3fdc13b7ed865c6cbf48b2f15.1497452002.git.Janakarajan.Natarajan@amd.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Janakarajan Natarajan and committed by
Ingo Molnar 910448bb 1ccb2f4e

+2 -2
+1 -1
arch/x86/events/amd/uncore.c
··· 555 555 ret = 0; 556 556 } 557 557 558 - if (boot_cpu_has(X86_FEATURE_PERFCTR_L2)) { 558 + if (boot_cpu_has(X86_FEATURE_PERFCTR_LLC)) { 559 559 amd_uncore_llc = alloc_percpu(struct amd_uncore *); 560 560 if (!amd_uncore_llc) { 561 561 ret = -ENOMEM;
+1 -1
arch/x86/include/asm/cpufeatures.h
··· 177 177 #define X86_FEATURE_PERFCTR_NB ( 6*32+24) /* NB performance counter extensions */ 178 178 #define X86_FEATURE_BPEXT (6*32+26) /* data breakpoint extension */ 179 179 #define X86_FEATURE_PTSC ( 6*32+27) /* performance time-stamp counter */ 180 - #define X86_FEATURE_PERFCTR_L2 ( 6*32+28) /* L2 performance counter extensions */ 180 + #define X86_FEATURE_PERFCTR_LLC ( 6*32+28) /* Last Level Cache performance counter extensions */ 181 181 #define X86_FEATURE_MWAITX ( 6*32+29) /* MWAIT extension (MONITORX/MWAITX) */ 182 182 183 183 /*