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

[linux-2.6-block.git] / arch / arm64 / kernel / cpuinfo.c

diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index 0593665fc7b481dbfaaab4ba9093e51368037e24..876055e373525999e1775dbd2a1bc482c9359b62 100644 (file)
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -82,6 +82,8 @@ static const char *const hwcap_str[] = {
        "svebitperm",
        "svesha3",
        "svesm4",
+       "flagm2",
+       "frint",
        NULL
 };