Merge remote-tracking branch 'tip/auto-latest'

[karo-tx-linux.git] / arch / arm / kernel / setup.c

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index af7b7db4699eda5d0a5d2b70f451dad95df4b7fc..ffb5809efc626b6c6eb61a0d30fc03104ec8ec39 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -601,6 +601,8 @@ static void __init setup_processor(void)
        elf_hwcap &= ~(HWCAP_THUMB | HWCAP_IDIVT);
 #endif
 
+       erratum_a15_798181_init();
+
        feat_v6_fixup();
 
        cacheid_init();
@@ -979,6 +981,7 @@ static const char *hwcap_str[] = {
        "idivt",
        "vfpd32",
        "lpae",
+       "evtstrm",
        NULL
 };