diff options
| author | Will Deacon <will@kernel.org> | 2024-01-04 12:28:14 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2024-01-04 12:28:14 +0000 |
| commit | 30431774fe6e96f9418911f36b99914f54089d75 (patch) | |
| tree | 66dbdc996775f1a6ff38858d2015211e94fd68b3 /arch/arm64/kernel | |
| parent | dd9168ab08ebbf5643434c652a5f22ffa96dbdf3 (diff) | |
| parent | f35c32ca6839f5777862dbe2138d02bf50b3dfa7 (diff) | |
Merge branch 'for-next/rip-vpipt' into for-next/core
* for-next/rip-vpipt:
arm64: Rename reserved values for CTR_EL0.L1Ip
arm64: Kill detection of VPIPT i-cache policy
KVM: arm64: Remove VPIPT I-cache handling
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/cpuinfo.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index a257da7b56fe..47043c0d95ec 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -36,8 +36,6 @@ static struct cpuinfo_arm64 boot_cpu_data; static inline const char *icache_policy_str(int l1ip) { switch (l1ip) { - case CTR_EL0_L1Ip_VPIPT: - return "VPIPT"; case CTR_EL0_L1Ip_VIPT: return "VIPT"; case CTR_EL0_L1Ip_PIPT: @@ -388,9 +386,6 @@ static void cpuinfo_detect_icache_policy(struct cpuinfo_arm64 *info) switch (l1ip) { case CTR_EL0_L1Ip_PIPT: break; - case CTR_EL0_L1Ip_VPIPT: - set_bit(ICACHEF_VPIPT, &__icache_flags); - break; case CTR_EL0_L1Ip_VIPT: default: /* Assume aliasing */ |