void default_send_IPI_mask_sequence_phys(const struct cpumask *mask, int vector)
 {
-       unsigned long query_cpu;
        unsigned long flags;
+       unsigned long cpu;
 
-       /*
-        * Hack. The clustered APIC addressing mode doesn't allow us to send
-        * to an arbitrary mask, so I do a unicast to each CPU instead.
-        * - mbligh
-        */
        local_irq_save(flags);
-       for_each_cpu(query_cpu, mask) {
+       for_each_cpu(cpu, mask) {
                __default_send_IPI_dest_field(per_cpu(x86_cpu_to_apicid,
-                               query_cpu), vector, APIC_DEST_PHYSICAL);
+                               cpu), vector, APIC_DEST_PHYSICAL);
        }
        local_irq_restore(flags);
 }
 void default_send_IPI_mask_allbutself_phys(const struct cpumask *mask,
                                                 int vector)
 {
-       unsigned int this_cpu = smp_processor_id();
-       unsigned int query_cpu;
+       unsigned int cpu, this_cpu = smp_processor_id();
        unsigned long flags;
 
-       /* See Hack comment above */
-
        local_irq_save(flags);
-       for_each_cpu(query_cpu, mask) {
-               if (query_cpu == this_cpu)
+       for_each_cpu(cpu, mask) {
+               if (cpu == this_cpu)
                        continue;
                __default_send_IPI_dest_field(per_cpu(x86_cpu_to_apicid,
-                                query_cpu), vector, APIC_DEST_PHYSICAL);
+                                cpu), vector, APIC_DEST_PHYSICAL);
        }
        local_irq_restore(flags);
 }
        local_irq_restore(flags);
 }
 
-/* must come after the send_IPI functions above for inlining */
 static int convert_apicid_to_cpu(int apic_id)
 {
        int i;