2012-06-14 07:50:52

by Alexander Gordeev

Subject: [PATCH 6/6] 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 <[email protected]>
---
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)
--
1.7.7.6


--
Regards,
Alexander Gordeev
[email protected]

2012-06-14 14:50:15

by Alexander Gordeev

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 <[email protected]>
AuthorDate: Thu, 14 Jun 2012 09:50:44 +0200
Committer: Ingo Molnar <[email protected]>
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 <[email protected]>
Cc: Suresh Siddha <[email protected]>
Cc: Yinghai Lu <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
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)