diff options
| author | Mike Travis <travis@sgi.com> | 2008-12-16 20:33:55 -0500 |
|---|---|---|
| committer | Mike Travis <travis@sgi.com> | 2008-12-16 20:40:56 -0500 |
| commit | 6eeb7c5a99434596c5953a95baa17d2f085664e3 (patch) | |
| tree | 30fd0b08b0a427b953beaf92927468bf86fad956 /arch/x86/include/asm/mach-default | |
| parent | 95d313cf1c1ecedc8bec5727b09bdacbf67dfc45 (diff) | |
x86: update add-cpu_mask_to_apicid_and to use struct cpumask*
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>
Diffstat (limited to 'arch/x86/include/asm/mach-default')
| -rw-r--r-- | arch/x86/include/asm/mach-default/mach_apic.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h index 229b605d104e..df8e024c43c5 100644 --- a/arch/x86/include/asm/mach-default/mach_apic.h +++ b/arch/x86/include/asm/mach-default/mach_apic.h | |||
| @@ -67,11 +67,11 @@ static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) | |||
| 67 | return cpus_addr(*cpumask)[0]; | 67 | return cpus_addr(*cpumask)[0]; |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask, | 70 | static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask, |
| 71 | const cpumask_t *andmask) | 71 | const struct cpumask *andmask) |
| 72 | { | 72 | { |
| 73 | unsigned long mask1 = cpus_addr(*cpumask)[0]; | 73 | unsigned long mask1 = cpumask_bits(cpumask)[0]; |
| 74 | unsigned long mask2 = cpus_addr(*andmask)[0]; | 74 | unsigned long mask2 = cpumask_bits(andmask)[0]; |
| 75 | 75 | ||
| 76 | return (unsigned int)(mask1 & mask2); | 76 | return (unsigned int)(mask1 & mask2); |
| 77 | } | 77 | } |