1 files changed, 5 insertions, 1 deletions

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index eebee4cbc14b..7834f73efbf1 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -597,9 +597,13 @@ static const struct x86_cpu_id deadline_match[] = {
 
 static void apic_check_deadline_errata(void)
 {
-        const struct x86_cpu_id *m = x86_match_cpu(deadline_match);
+        const struct x86_cpu_id *m;
         u32 rev;
 
+        if (!boot_cpu_has(X86_FEATURE_TSC_DEADLINE_TIMER))
+                return;
+
+        m = x86_match_cpu(deadline_match);
         if (!m)
                 return;