2012-06-15 15:11:10

by Ido Yariv

Subject: [PATCH] x86/vsmp: Fix vector_allocation_domain's return value

Commit 8637e38a ("x86/apic: Avoid useless scanning thru a cpumask in
assign_irq_vector()") modified vector_allocation_domain() to return a
boolean indicating if cpumask is dynamic or static. Adjust vSMP's
callback implementation accordingly.

Signed-off-by: Ido Yariv <[email protected]>
Acked-by: Shai Fultheim <[email protected]>
Cc: Alexander Gordeev <[email protected]>
---
arch/x86/kernel/vsmp_64.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index 3f0285a..fa5adb7 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -208,9 +208,10 @@ static int apicid_phys_pkg_id(int initial_apic_id, int index_msb)
* In vSMP, all cpus should be capable of handling interrupts, regardless of
* the APIC used.
*/
-static void fill_vector_allocation_domain(int cpu, struct cpumask *retmask)
+static bool fill_vector_allocation_domain(int cpu, struct cpumask *retmask)
{
cpumask_setall(retmask);
+ return false;
}

static void vsmp_apic_post_init(void)
--
1.7.7.6

2012-06-20 10:42:20

by Ido Yariv

Subject: [tip:x86/platform] x86/vsmp: Fix vector_allocation_domain' s return value

Commit-ID: abf71f3066740f3b59c3f731b4b68ed335f7b24d
Gitweb: http://git.kernel.org/tip/abf71f3066740f3b59c3f731b4b68ed335f7b24d
Author: Ido Yariv <[email protected]>
AuthorDate: Fri, 15 Jun 2012 18:10:55 +0300
Committer: Ingo Molnar <[email protected]>
CommitDate: Mon, 18 Jun 2012 11:10:23 +0200

x86/vsmp: Fix vector_allocation_domain's return value

Commit 8637e38a ("x86/apic: Avoid useless scanning thru a
cpumask in assign_irq_vector()") modified
vector_allocation_domain() to return a boolean indicating if
cpumask is dynamic or static. Adjust vSMP's callback
implementation accordingly.

Signed-off-by: Ido Yariv <[email protected]>
Acked-by: Shai Fultheim <[email protected]>
Cc: Alexander Gordeev <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/kernel/vsmp_64.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index 3f0285a..fa5adb7 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -208,9 +208,10 @@ static int apicid_phys_pkg_id(int initial_apic_id, int index_msb)
* In vSMP, all cpus should be capable of handling interrupts, regardless of
* the APIC used.
*/
-static void fill_vector_allocation_domain(int cpu, struct cpumask *retmask)
+static bool fill_vector_allocation_domain(int cpu, struct cpumask *retmask)
{
cpumask_setall(retmask);
+ return false;
}

static void vsmp_apic_post_init(void)