The patch titled
x86_64: add genapic_force
has been removed from the -mm tree. Its filename was
x86_64-add-genapic_force.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
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: Andi Kleen <ak@xxxxxxx>
Cc: "Li, Shaohua" <shaohua.li@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/kernel/genapic.c | 9 ++++++++-
include/asm-x86_64/genapic.h | 2 +-
2 files changed, 9 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,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 -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
genapic-optimize-fix-apic-mode-setup.patch
suspend-dont-change-cpus_allowed-for-task-initiating-the-suspend.patch
sched-domain-move-sched-group-allocations-to-percpu-area.patch
sched-domain-increase-the-smt-busy-rebalance-interval.patch
sched-avoid-taking-rq-lock-in-wake_priority_sleeper.patch
sched-remove-staggering-of-load-balancing.patch
sched-disable-interrupts-for-locking-in-load_balance.patch
sched-extract-load-calculation-from-rebalance_tick.patch
sched-move-idle-status-calculation-into-rebalance_tick.patch
sched-use-softirq-for-load-balancing.patch
sched-call-tasklet-less-frequently.patch
sched-add-option-to-serialize-load-balancing.patch
mm-only-sched-add-a-few-scheduler-event-counters.patch
sched-optimize-activate_task-for-rt-task.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
