---

yaml --- r: 43099 b: refs/heads/master c: 9899f82 h: refs/heads/master i: 43097: e0e4c7b 43095: 8a5e315 v: v3
git-mirror · Dec 7, 2006 · 4e50899 · 4e50899
1 parent 688fe8a
commit 4e50899
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72486f1f8f0a2bc828b9d30cf4690cf2dd6807fc
+refs/heads/master: 9899f826fc90beba4f78083f6230e06cbe1050c9
diff --git a/trunk/arch/x86_64/kernel/genapic.c b/trunk/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

diff --git a/trunk/include/asm-x86_64/genapic.h b/trunk/include/asm-x86_64/genapic.h
@@ -30,6 +30,6 @@ struct genapic {
 };
 
 
-extern struct genapic *genapic;
+extern struct genapic *genapic, *genapic_force, apic_flat;
 
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,6 @@ struct genapic { @@
     };
-    extern struct genapic *genapic;
+    extern struct genapic *genapic, *genapic_force, apic_flat;
     #endif