1 files changed, 8 insertions, 1 deletions

diff --git a/arch/x86_64/kernel/genapic.c b/arch/x86_64/kernel/genapic.c
index 8e78a75d1866..b007433f96bb 100644
--- a/arch/x86_64/kernel/genapic.c
+++ b/arch/x86_64/kernel/genapic.c
@@ -33,7 +33,7 @@ extern struct genapic apic_flat;
 extern struct genapic apic_physflat;
 
 struct genapic *genapic = &apic_flat;
-
+struct genapic *genapic_force;
 
 /*
  * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.
@@ -46,6 +46,13 @@ void __init clustered_apic_check(void)
         u8 cluster_cnt[NUM_APIC_CLUSTERS];
         int max_apic = 0;
 
+        /* genapic selection can be forced because of certain quirks.
+         */
+        if (genapic_force) {
+                genapic = genapic_force;
+                goto print;
+        }
+
 #if defined(CONFIG_ACPI)
         /*
          * Some x86_64 machines use physical APIC mode regardless of how many