ANDROID: arm64: add HWCAP2 flags to compat /proc/cpuinfo

Commit 72684eae ("arm64: Fix up
/proc/cpuinfo") backported the new /proc/cpuinfo handler to 3.10.69.
However since mainline 3.10 doesn't have the ARM HWCAP2 definitions,
this part was dropped from the backport.

android-3.10 *does* have these HWCAP2 definitions, so restore the
relevant parts from the original commit
(44b82b77).

Bug: 27982275

Change-Id: Ib62de783580e4c269c8e98c62ece9f8fc9e5836b
Signed-off-by: Greg Hackmann <ghackmann@google.com>

arch/arm64/kernel/setup.c

@@ -501,6 +501,15 @@ static const char *compat_hwcap_str[] = {
 	"lpae",
 	"evtstrm"
 };
+
+static const char *compat_hwcap2_str[] = {
+	"aes",
+	"pmull",
+	"sha1",
+	"sha2",
+	"crc32",
+	NULL
+};
 #endif /* CONFIG_COMPAT */
 static int c_show(struct seq_file *m, void *v)
 {
@@ -532,6 +541,10 @@ static int c_show(struct seq_file *m, void *v)
 			for (j = 0; compat_hwcap_str[j]; j++)
 				if (COMPAT_ELF_HWCAP & (1 << j))
 					seq_printf(m, " %s", compat_hwcap_str[j]);
+
+			for (j = 0; compat_hwcap2_str[j]; j++)
+				if (compat_elf_hwcap2 & (1 << j))
+					seq_printf(m, " %s", compat_hwcap2_str[j]);
 #endif /* CONFIG_COMPAT */
 		} else {
 			for (j = 0; hwcap_str[j]; j++)