diff options
author | Ingo Molnar | 2008-07-25 13:08:16 +0200 |
---|---|---|
committer | Ingo Molnar | 2008-07-25 13:08:16 +0200 |
commit | 10a010f6953b5a14ba2f0be40a4fce1bea220875 (patch) | |
tree | 19aadf718c796bc7fae0a1a1c970d84d67c541d4 /include/asm-x86/ipi.h | |
parent | x86: move declaring x2apic_extra_bits (diff) | |
parent | fix fs/nfs/nfsroot.c compilation (diff) | |
download | kernel-qcow2-linux-10a010f6953b5a14ba2f0be40a4fce1bea220875.tar.gz kernel-qcow2-linux-10a010f6953b5a14ba2f0be40a4fce1bea220875.tar.xz kernel-qcow2-linux-10a010f6953b5a14ba2f0be40a4fce1bea220875.zip |
Merge branch 'linus' into x86/x2apic
Conflicts:
drivers/pci/dmar.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/ipi.h')
-rw-r--r-- | include/asm-x86/ipi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/ipi.h b/include/asm-x86/ipi.h index 3d8d6a6c1f8e..8d1178b0ba77 100644 --- a/include/asm-x86/ipi.h +++ b/include/asm-x86/ipi.h @@ -128,7 +128,7 @@ static inline void send_IPI_mask_sequence(cpumask_t mask, int vector) * - mbligh */ local_irq_save(flags); - for_each_cpu_mask(query_cpu, mask) { + for_each_cpu_mask_nr(query_cpu, mask) { __send_IPI_dest_field(per_cpu(x86_cpu_to_apicid, query_cpu), vector, APIC_DEST_PHYSICAL); } |