]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge branch 'for-next/fixes' into for-next/core
authorWill Deacon <will@kernel.org>
Thu, 4 Jan 2024 12:28:46 +0000 (12:28 +0000)
committerWill Deacon <will@kernel.org>
Thu, 4 Jan 2024 12:32:33 +0000 (12:32 +0000)
Merge in arm64 fixes queued for 6.7 so that kpti_install_ng_mappings()
can be updated to use arm64_kernel_unmapped_at_el0() instead of checking
the ARM64_UNMAP_KERNEL_AT_EL0 CPU capability directly.

* for-next/fixes:
  arm64: mm: Always make sw-dirty PTEs hw-dirty in pte_modify
  perf/arm-cmn: Fail DTC counter allocation correctly
  arm64: Avoid enabling KPTI unnecessarily

1  2 
arch/arm64/kernel/cpufeature.c
drivers/perf/arm-cmn.c

index 73b10e64b9dff8af145d7a1187b6ab85cef6ca4c,91d2d671496911806c21e1cbb7895fd7cb612810..01a4c1d7fc09a8e2c1c484a5cadcb2c6ca8433bf
@@@ -1843,6 -1839,10 +1843,10 @@@ static int __init __kpti_install_ng_map
  
  static void __init kpti_install_ng_mappings(void)
  {
 -      if (!cpus_have_cap(ARM64_UNMAP_KERNEL_AT_EL0))
+       /* Check whether KPTI is going to be used */
++      if (!arm64_kernel_unmapped_at_el0())
+               return;
        /*
         * We don't need to rewrite the page-tables if either we've done
         * it already or we have KASLR enabled and therefore have not
Simple merge