Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[platform/kernel/linux-starfive.git] / arch / arm64 / kernel / cpufeature.c

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index bf38d06..7d7128c 100644 (file)
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -2676,26 +2676,26 @@ static const struct arm64_cpu_capabilities arm64_features[] = {
 #ifdef CONFIG_ARM64_PTR_AUTH
 static const struct arm64_cpu_capabilities ptr_auth_hwcap_addr_matches[] = {
        {
-               ARM64_CPUID_FIELDS(ID_AA64ISAR1_EL1, APA, PAuth)
+               HWCAP_CPUID_MATCH(ID_AA64ISAR1_EL1, APA, PAuth)
        },
        {
-               ARM64_CPUID_FIELDS(ID_AA64ISAR2_EL1, APA3, PAuth)
+               HWCAP_CPUID_MATCH(ID_AA64ISAR2_EL1, APA3, PAuth)
        },
        {
-               ARM64_CPUID_FIELDS(ID_AA64ISAR1_EL1, API, PAuth)
+               HWCAP_CPUID_MATCH(ID_AA64ISAR1_EL1, API, PAuth)
        },
        {},
 };
 
 static const struct arm64_cpu_capabilities ptr_auth_hwcap_gen_matches[] = {
        {
-               ARM64_CPUID_FIELDS(ID_AA64ISAR1_EL1, GPA, IMP)
+               HWCAP_CPUID_MATCH(ID_AA64ISAR1_EL1, GPA, IMP)
        },
        {
-               ARM64_CPUID_FIELDS(ID_AA64ISAR2_EL1, GPA3, IMP)
+               HWCAP_CPUID_MATCH(ID_AA64ISAR2_EL1, GPA3, IMP)
        },
        {
-               ARM64_CPUID_FIELDS(ID_AA64ISAR1_EL1, GPI, IMP)
+               HWCAP_CPUID_MATCH(ID_AA64ISAR1_EL1, GPI, IMP)
        },
        {},
 };