[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-5a0a2a308113086cc800a203d903271c9caa1611@git.kernel.org>
Date: Thu, 14 Jun 2012 07:50:02 -0700
From: tip-bot for Alexander Gordeev <agordeev@...hat.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, agordeev@...hat.com, hpa@...or.com,
mingo@...nel.org, yinghai@...nel.org, suresh.b.siddha@...el.com,
tglx@...utronix.de
Subject: [tip:x86/apic] x86/apic/es7000: Make apicid of a cluster (not CPU)
from a cpumask
Commit-ID: 5a0a2a308113086cc800a203d903271c9caa1611
Gitweb: http://git.kernel.org/tip/5a0a2a308113086cc800a203d903271c9caa1611
Author: Alexander Gordeev <agordeev@...hat.com>
AuthorDate: Thu, 14 Jun 2012 09:50:44 +0200
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Thu, 14 Jun 2012 12:53:16 +0200
x86/apic/es7000: Make apicid of a cluster (not CPU) from a cpumask
cpu_mask_to_apicid_and() always returns apicid of a single CPU,
even in case multiple CPUs were requested. This update fixes a
typo and forces apicid of a cluster to be returned.
Signed-off-by: Alexander Gordeev <agordeev@...hat.com>
Cc: Suresh Siddha <suresh.b.siddha@...el.com>
Cc: Yinghai Lu <yinghai@...nel.org>
Link: http://lkml.kernel.org/r/20120614075043.GI3383@dhcp-26-207.brq.redhat.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/kernel/apic/es7000_32.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index 9882093..0874799 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -542,7 +542,7 @@ es7000_cpu_mask_to_apicid(const struct cpumask *cpumask, unsigned int *dest_id)
return -EINVAL;
}
- apicid = new_apicid;
+ apicid |= new_apicid;
round++;
}
if (!round)
--
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