[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1406080786-3938-14-git-send-email-gong.chen@linux.intel.com>
Date: Tue, 22 Jul 2014 21:58:49 -0400
From: "Chen, Gong" <gong.chen@...ux.intel.com>
To: linux-kernel@...r.kernel.org
Cc: mingo@...nel.org, tglx@...utronix.de, paulus@...ba.org,
benh@...nel.crashing.org, tony.luck@...el.com, hpa@...or.com,
jkosina@...e.cz, rafael.j.wysocki@...el.com, bp@...en8.de,
linux@....linux.org.uk, ralf@...ux-mips.org,
schwidefsky@...ibm.com, davem@...emloft.net,
viro@...iv.linux.org.uk, fweisbec@...il.com, cl@...ux.com,
akpm@...ux-foundation.org, axboe@...nel.dk,
JBottomley@...allels.com, neilb@...e.de,
christoffer.dall@...aro.org, rostedt@...dmis.org, rric@...nel.org,
gregkh@...uxfoundation.org, mhocko@...e.cz, david@...morbit.com,
"Chen, Gong" <gong.chen@...ux.intel.com>
Subject: [RFC PATCH v1 13/70] x86, x2apic_cluster: _FROZEN Cleanup
Remove XXX_FROZEN state from x86/x2apic_cluster.
Signed-off-by: Chen, Gong <gong.chen@...ux.intel.com>
---
arch/x86/kernel/apic/x2apic_cluster.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index e66766b..bfd2369 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -154,8 +154,11 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
unsigned int cpu;
int err = 0;
- switch (action) {
+ switch (action & ~CPU_TASKS_FROZEN) {
case CPU_UP_PREPARE:
+ if (action & CPU_TASKS_FROZEN)
+ break;
+
if (!zalloc_cpumask_var(&per_cpu(cpus_in_cluster, this_cpu),
GFP_KERNEL)) {
err = -ENOMEM;
@@ -165,9 +168,11 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
err = -ENOMEM;
}
break;
- case CPU_UP_CANCELED:
- case CPU_UP_CANCELED_FROZEN:
case CPU_DEAD:
+ /* fall though to next if action == CPU_DEAD */
+ if (action & CPU_TASKS_FROZEN)
+ break;
+ case CPU_UP_CANCELED:
for_each_online_cpu(cpu) {
if (x2apic_cluster(this_cpu) != x2apic_cluster(cpu))
continue;
--
2.0.0.rc2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists