xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: update add-cpu_mask_to_apicid_and to use struct cpumask*

Browse Source 
Impact: use updated APIs

Various API updates for x86:add-cpu_mask_to_apicid_and

(Note: separate because previous patch has been "backported" to 2.6.27.)

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Mike Travis <travis@sgi.com>
This commit is contained in:
Mike Travis
2008-12-16 17:33:55 -08:00
parent 95d313cf1c
commit 6eeb7c5a99
11 changed files with 60 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/kernel/genx2apic_cluster.c
View File

@@ -123,8 +123,8 @@ static unsigned int x2apic_cpu_mask_to_apicid(const cpumask_t *cpumask)
return BAD_APICID;
}
static unsigned int x2apic_cpu_mask_to_apicid_and(const cpumask_t *cpumask,
const cpumask_t *andmask)
static unsigned int x2apic_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
const struct cpumask *andmask)
{
int cpu;
@@ -132,9 +132,9 @@ static unsigned int x2apic_cpu_mask_to_apicid_and(const cpumask_t *cpumask,
* We're using fixed IRQ delivery, can only return one phys APIC ID.
* May as well be the first.
*/
while ((cpu = next_cpu(-1, *cpumask)) < nr_cpu_ids)
if (cpu_isset(cpu, *andmask))
return per_cpu(x86_cpu_to_apicid, cpu);
cpu = cpumask_any_and(cpumask, andmask);
if (cpu < nr_cpu_ids)
return per_cpu(x86_cpu_to_apicid, cpu);
return BAD_APICID;
}