[PATCH] Fix broken indentation in iommu_setup

[cascardo/linux.git] / arch / x86_64 / kernel / genapic_cluster.c

diff --git a/arch/x86_64/kernel/genapic_cluster.c b/arch/x86_64/kernel/genapic_cluster.c
index a472d62..cdb90e6 100644 (file)
--- a/arch/x86_64/kernel/genapic_cluster.c
+++ b/arch/x86_64/kernel/genapic_cluster.c
@@ -9,7 +9,6 @@
  * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and
  * James Cleverdon.
  */
-#include <linux/config.h>
 #include <linux/threads.h>
 #include <linux/cpumask.h>
 #include <linux/string.h>
@@ -72,14 +71,11 @@ static void cluster_send_IPI_mask(cpumask_t mask, int vector)
 static void cluster_send_IPI_allbutself(int vector)
 {
        cpumask_t mask = cpu_online_map;
-       int me = get_cpu(); /* Ensure we are not preempted when we clear */
 
-       cpu_clear(me, mask);
+       cpu_clear(smp_processor_id(), mask);
 
        if (!cpus_empty(mask))
                cluster_send_IPI_mask(mask, vector);
-
-       put_cpu();
 }
 
 static void cluster_send_IPI_all(int vector)
@@ -122,7 +118,6 @@ struct genapic apic_cluster = {
        .name = "clustered",
        .int_delivery_mode = dest_Fixed,
        .int_dest_mode = (APIC_DEST_PHYSICAL != 0),
-       .int_delivery_dest = APIC_DEST_PHYSICAL | APIC_DM_FIXED,
        .target_cpus = cluster_target_cpus,
        .apic_id_registered = cluster_apic_id_registered,
        .init_apic_ldr = cluster_init_apic_ldr,