Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

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

diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c
index c553d30..2fe2491 100644 (file)
--- a/arch/arm64/kernel/idreg-override.c
+++ b/arch/arm64/kernel/idreg-override.c
@@ -123,6 +123,7 @@ static const struct ftr_set_desc isar2 __initconst = {
        .fields         = {
                FIELD("gpa3", ID_AA64ISAR2_EL1_GPA3_SHIFT, NULL),
                FIELD("apa3", ID_AA64ISAR2_EL1_APA3_SHIFT, NULL),
+               FIELD("mops", ID_AA64ISAR2_EL1_MOPS_SHIFT, NULL),
                {}
        },
 };
@@ -181,6 +182,7 @@ static const struct {
          "id_aa64isar1.gpi=0 id_aa64isar1.gpa=0 "
          "id_aa64isar1.api=0 id_aa64isar1.apa=0 "
          "id_aa64isar2.gpa3=0 id_aa64isar2.apa3=0"        },
+       { "arm64.nomops",               "id_aa64isar2.mops=0" },
        { "arm64.nomte",                "id_aa64pfr1.mte=0" },
        { "nokaslr",                    "arm64_sw.nokaslr=1" },
 };