diff options
| author | Dave Hansen <dave.hansen@linux.intel.com> | 2020-03-05 09:47:06 -0800 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2021-03-08 11:05:20 +0100 |
| commit | 09141ec0e4efede4fb5e2aa68cb819fba974325c (patch) | |
| tree | e8d8a28ea5f3c038b6d21da5c94fa4936dcb3af0 /tools/perf/trace/beauty | |
| parent | a38fd8748464831584a19438cbb3082b5a2dab15 (diff) | |
| download | linux-stable-09141ec0e4efede4fb5e2aa68cb819fba974325c.tar.gz linux-stable-09141ec0e4efede4fb5e2aa68cb819fba974325c.tar.bz2 linux-stable-09141ec0e4efede4fb5e2aa68cb819fba974325c.zip | |
x86: Remove duplicate TSC DEADLINE MSR definitions
There are two definitions for the TSC deadline MSR in msr-index.h,
one with an underscore and one without. Axe one of them and move
all the references over to the other one.
[ bp: Fixup the MSR define in handle_fastpath_set_msr_irqoff() too. ]
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200305174706.0D6B8EE4@viggo.jf.intel.com
Diffstat (limited to 'tools/perf/trace/beauty')
| -rwxr-xr-x | tools/perf/trace/beauty/tracepoints/x86_msr.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/trace/beauty/tracepoints/x86_msr.sh b/tools/perf/trace/beauty/tracepoints/x86_msr.sh index 27ee1ea1fe94..9b0614a87831 100755 --- a/tools/perf/trace/beauty/tracepoints/x86_msr.sh +++ b/tools/perf/trace/beauty/tracepoints/x86_msr.sh @@ -15,7 +15,7 @@ x86_msr_index=${arch_x86_header_dir}/msr-index.h printf "static const char *x86_MSRs[] = {\n" regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+MSR_([[:alnum:]][[:alnum:]_]+)[[:space:]]+(0x00000[[:xdigit:]]+)[[:space:]]*.*' -egrep $regex ${x86_msr_index} | egrep -v 'MSR_(ATOM|P[46]|IA32_(TSCDEADLINE|UCODE_REV)|IDT_FCR4)' | \ +egrep $regex ${x86_msr_index} | egrep -v 'MSR_(ATOM|P[46]|IA32_(TSC_DEADLINE|UCODE_REV)|IDT_FCR4)' | \ sed -r "s/$regex/\2 \1/g" | sort -n | \ xargs printf "\t[%s] = \"%s\",\n" printf "};\n\n" |