]> Git Repo - linux.git/commit
x86/msr: Move the F15h MSRs where they belong
authorBorislav Petkov <[email protected]>
Sun, 21 Jun 2020 10:41:53 +0000 (12:41 +0200)
committerBorislav Petkov <[email protected]>
Mon, 22 Jun 2020 15:15:53 +0000 (17:15 +0200)
commit99e40204e014e06644072c39001a269d9689e0d1
treec77c9f02ec58fe90d9d9d20cdddfb43666ab259e
parent286d966b21587b6303081b902f5c5e30b691baf5
x86/msr: Move the F15h MSRs where they belong

1068ed4547ad ("x86/msr: Lift AMD family 0x15 power-specific MSRs")

moved the three F15h power MSRs to the architectural list but that was
wrong as they belong in the family 0x15 list. That also caused:

  In file included from trace/beauty/tracepoints/x86_msr.c:10:
  perf/trace/beauty/generated/x86_arch_MSRs_array.c:292:45: error: initialized field overwritten [-Werror=override-init]
    292 |  [0xc0010280 - x86_AMD_V_KVM_MSRs_offset] = "F15H_PTSC",
        |                                             ^~~~~~~~~~~
  perf/trace/beauty/generated/x86_arch_MSRs_array.c:292:45: note: (near initialization for 'x86_AMD_V_KVM_MSRs[640]')

due to MSR_F15H_PTSC ending up being defined twice. Move them where they
belong and drop the duplicate.

Also, drop the respective tools/ changes of the msr-index.h copy the
above commit added because perf tool developers prefer to go through
those changes themselves in order to figure out whether changes to the
kernel headers would need additional handling in perf.

Fixes: 1068ed4547ad ("x86/msr: Lift AMD family 0x15 power-specific MSRs")
Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Acked-by: Arnaldo Carvalho de Melo <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
arch/x86/include/asm/msr-index.h
tools/arch/x86/include/asm/msr-index.h
This page took 0.058307 seconds and 4 git commands to generate.