Merge android-4.4.160 (a94efb1) into msm-4.4

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / arch / arm64 / include / asm / cpufeature.h

diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
index 6e99309..d00e27e 100644 (file)
--- a/arch/arm64/include/asm/cpufeature.h
+++ b/arch/arm64/include/asm/cpufeature.h
@@ -38,7 +38,8 @@
 #define ARM64_HAS_VIRT_HOST_EXTN               12
 #define ARM64_HARDEN_BRANCH_PREDICTOR          13
 #define ARM64_UNMAP_KERNEL_AT_EL0              14
-#define ARM64_NCAPS                            15
+#define ARM64_HAS_32BIT_EL0                    15
+#define ARM64_NCAPS                            16
 
 #ifndef __ASSEMBLY__
 
@@ -190,6 +191,11 @@ static inline bool cpu_supports_mixed_endian_el0(void)
        return id_aa64mmfr0_mixed_endian_el0(read_cpuid(SYS_ID_AA64MMFR0_EL1));
 }
 
+static inline bool system_supports_32bit_el0(void)
+{
+       return cpus_have_cap(ARM64_HAS_32BIT_EL0);
+}
+
 static inline bool system_supports_mixed_endian_el0(void)
 {
        return id_aa64mmfr0_mixed_endian_el0(read_system_reg(SYS_ID_AA64MMFR0_EL1));