From a906d812e2037d58377657b76acc673e77c1817e Mon Sep 17 00:00:00 2001 From: Alexander Gordeev Date: Thu, 14 Jun 2012 12:39:34 +0200 Subject: [PATCH] --- yaml --- r: 312424 b: refs/heads/master c: cac4afbc3da58d9e5701b34bd4c1f11ea13328d4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic/x2apic_cluster.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index baa16f8d18f2..3f3f0bc2f0f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed88bed881c9948c4035828c5d63f60c7b015f86 +refs/heads/master: cac4afbc3da58d9e5701b34bd4c1f11ea13328d4 diff --git a/trunk/arch/x86/kernel/apic/x2apic_cluster.c b/trunk/arch/x86/kernel/apic/x2apic_cluster.c index 23a46cf5b6fd..1885a73b7f33 100644 --- a/trunk/arch/x86/kernel/apic/x2apic_cluster.c +++ b/trunk/arch/x86/kernel/apic/x2apic_cluster.c @@ -228,10 +228,11 @@ static int x2apic_cluster_probe(void) /* * Each x2apic cluster is an allocation domain. */ -static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask) +static bool cluster_vector_allocation_domain(int cpu, struct cpumask *retmask) { cpumask_clear(retmask); cpumask_copy(retmask, per_cpu(cpus_in_cluster, cpu)); + return true; } static struct apic apic_x2apic_cluster = {