Skip to content

Commit 910448b

Browse files
Janakarajan NatarajanIngo Molnar
authored andcommitted
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 <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Borislav Petkov <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Suravee Suthikulpanit <[email protected]> Cc: Thomas Gleixner <[email protected]> Link: http://lkml.kernel.org/r/016311029fdecdc3fdc13b7ed865c6cbf48b2f15.1497452002.git.Janakarajan.Natarajan@amd.com Signed-off-by: Ingo Molnar <[email protected]>
1 parent 1ccb2f4 commit 910448b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/x86/events/amd/uncore.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ static int __init amd_uncore_init(void)
555555
ret = 0;
556556
}
557557

558-
if (boot_cpu_has(X86_FEATURE_PERFCTR_L2)) {
558+
if (boot_cpu_has(X86_FEATURE_PERFCTR_LLC)) {
559559
amd_uncore_llc = alloc_percpu(struct amd_uncore *);
560560
if (!amd_uncore_llc) {
561561
ret = -ENOMEM;

arch/x86/include/asm/cpufeatures.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
#define X86_FEATURE_PERFCTR_NB ( 6*32+24) /* NB performance counter extensions */
178178
#define X86_FEATURE_BPEXT (6*32+26) /* data breakpoint extension */
179179
#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 */
181181
#define X86_FEATURE_MWAITX ( 6*32+29) /* MWAIT extension (MONITORX/MWAITX) */
182182

183183
/*

0 commit comments

Comments
 (0)