]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
arm64: cputype: Remove duplicate Cortex-X1C definitions
authorMark Rutland <mark.rutland@arm.com>
Thu, 18 Sep 2025 14:11:31 +0000 (15:11 +0100)
committerWill Deacon <will@kernel.org>
Thu, 18 Sep 2025 16:51:50 +0000 (17:51 +0100)
commit52b49bd6de29a89a040fa33e980270904c734d69
treee9baa5fb495f785ee7a0422cba1ea493977b3cf0
parent3ba8d4aa42bd5dc6e2493ce4a73bb41c9cfd77ca
arm64: cputype: Remove duplicate Cortex-X1C definitions

We currently have duplicate definitions for ARM_CPU_PART_CORTEX_X1C and
MIDR_CORTEX_X1C as a result of commits:

  58d245e03c324d08 ("arm64: cputype: Add Cortex-X1C definitions")
  efe676a1a7554219 ("arm64: proton-pack: Add new CPUs 'k' values for branch mitigation")

Due to inconsistent sorting when adding entries, there was no textual
conflict between the two patches.

Delete the duplicate definitions added by the latter commit.

The definitions in general are largely (but not entirely) in order of
the MIDR_EL1.PartNum value rather than by CPU name, and the remaining
Cortex-X1C definitions appear later in the list.

For now I haven't sorted the remaining MIDR definitions to minimize
churn. I intend to perform some larger cleanup of these in the near
future which should supersede that anyhow.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/include/asm/cputype.h