Merge tag 'lsk-v3.10-15.04-android'

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / kernel / setup.c

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 3d0b5a285061a1feb081b5ee4b9f2df92bce376c..47cd3ffd5eeb9a6addc43e4da756e5d1409df808 100644 (file)
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -533,7 +533,8 @@ static int c_show(struct seq_file *m, void *v)
                 * software which does already (at least for 32-bit).
                 */
                seq_puts(m, "Features\t:");
-               if (personality(current->personality) == PER_LINUX32) {
+               if (personality(current->personality) == PER_LINUX32 ||
+                   is_compat_task()) {
 #ifdef CONFIG_COMPAT
                        for (j = 0; compat_hwcap_str[j]; j++)
                                if (COMPAT_ELF_HWCAP & (1 << j))