build failure of next-20220919 due to c0357a73fa4a ("arm64/sysreg: Align field names in ID_AA64DFR0_EL1 with architecture")

Hi All,

The builds of arm64 allmodconfig have failed to build next-20220919 with the error:

drivers/perf/arm_spe_pmu.c: In function 'arm_spe_pmsevfr_res0':
drivers/perf/arm_spe_pmu.c:679:14: error: 'ID_AA64DFR0_PMSVER_8_2' undeclared (first use in this function); did you mean 'ID_AA64DFR0_EL1_PMSVer_IMP'?

  679 |         case ID_AA64DFR0_PMSVER_8_2:
      |              ^~~~~~~~~~~~~~~~~~~~~~
      |              ID_AA64DFR0_EL1_PMSVer_IMP
drivers/perf/arm_spe_pmu.c:679:14: note: each undeclared identifier is reported only once for each function it appears in
drivers/perf/arm_spe_pmu.c:681:14: error: 'ID_AA64DFR0_PMSVER_8_3' undeclared (first use in this function); did you mean 'ID_AA64DFR0_EL1_PMSVer_IMP'?
  681 |         case ID_AA64DFR0_PMSVER_8_3:
      |              ^~~~~~~~~~~~~~~~~~~~~~
      |              ID_AA64DFR0_EL1_PMSVer_IMP
drivers/perf/arm_spe_pmu.c: In function '__arm_spe_pmu_dev_probe':
drivers/perf/arm_spe_pmu.c:963:52: error: 'ID_AA64DFR0_PMSVER_SHIFT' undeclared (first use in this function); did you mean 'ID_AA64DFR0_EL1_PMSVer_SHIFT'?
  963 |                                                    ID_AA64DFR0_PMSVER_SHIFT);
      |                                                    ^~~~~~~~~~~~~~~~~~~~~~~~
      |                                                    ID_AA64DFR0_EL1_PMSVer_SHIFT

git bisect pointed to c0357a73fa4a ("arm64/sysreg: Align field names in ID_AA64DFR0_EL1 with architecture").

I will be happy to test any patch or provide any extra log if needed.

Regards
Sudip