Merge branch '2.5.x' into HEAD

[catacomb] / base / dispatch.c

diff --git a/base/dispatch.c b/base/dispatch.c
index 50c842e..4ce6015 100644 (file)
--- a/base/dispatch.c
+++ b/base/dispatch.c
@@ -413,7 +413,7 @@ static unsigned get_hwcaps(void)
   unsigned hw;
 
   DISPATCH_LOAD(hwcaps, hw);
-  if (!(hwcaps & HF_PROBED)) { probe_hwcaps(); DISPATCH_LOAD(hwcaps, hw); }
+  if (!(hw & HF_PROBED)) { probe_hwcaps(); DISPATCH_LOAD(hwcaps, hw); }
   return (hw);
 }
 
@@ -520,7 +520,7 @@ int cpu_feature_p(int feat)
                 cpuid_feature_p(CPUID_1_D, CPUID1D_SSE2) &&
                 xmm_registers_available_p());
     CASE_CPUFEAT(X86_AESNI, "x86:aesni",
-                cpuid_feature_p(CPUID_1_D, CPUID1C_AESNI) &&
+                cpuid_feature_p(CPUID_1_C, CPUID1C_AESNI) &&
                 xmm_registers_available_p());
     CASE_CPUFEAT(X86_RDRAND, "x86:rdrand",
                 cpuid_feature_p(CPUID_1_C, CPUID1C_RDRAND) &&