The patch titled
x86_64: add genapic_force
has been added to the -mm tree. Its filename is
x86_64-add-genapic_force.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: x86_64: add genapic_force
From: "Siddha, Suresh B" <suresh.b.siddha@xxxxxxxxx>
Add genapic_force. Used by the next Intel quirks patch.
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Cc: "Li, Shaohua" <shaohua.li@xxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/kernel/genapic.c | 10 +++++++++-
include/asm-x86_64/genapic.h | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff -puN arch/x86_64/kernel/genapic.c~x86_64-add-genapic_force arch/x86_64/kernel/genapic.c
--- a/arch/x86_64/kernel/genapic.c~x86_64-add-genapic_force
+++ a/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,14 @@ 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 and
+ * in future perhaps user can select this through cmdline
+ */
+ 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 -puN include/asm-x86_64/genapic.h~x86_64-add-genapic_force include/asm-x86_64/genapic.h
--- a/include/asm-x86_64/genapic.h~x86_64-add-genapic_force
+++ a/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
_
Patches currently in -mm which might be from suresh.b.siddha@xxxxxxxxx are
i386-add-write_pci_config_byte-to-direct-pci-access-routines.patch
i386-introduce-the-mechanism-of-disabling-cpu-hotplug-control.patch
x86_64-add-genapic_force.patch
fix-the-irqbalance-quirk-for-e7320-e7520-e7525.patch
suspend-dont-change-cpus_allowed-for-task-initiating-the-suspend.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
