Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / x86 / kernel / apic / x2apic_uv_x.c

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index c0b694810ff45adaf54fb8db5211f65a1f89b876..0f7f925e8ae1b93cf3f1b860f42028b8c7fe7564 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -525,16 +525,9 @@ static void uv_init_apic_ldr(void)
 {
 }
 
 {
 }
 

-static int
-uv_cpu_mask_to_apicid(const struct cpumask *mask, struct irq_data *irqdata,
-                     unsigned int *apicid)
+static u32 apic_uv_calc_apicid(unsigned int cpu)

 {
 {

-       int ret = default_cpu_mask_to_apicid(mask, irqdata, apicid);
-
-       if (!ret)
-               *apicid |= uv_apicid_hibits;
-
-       return ret;
+       return apic_default_calc_apicid(cpu) | uv_apicid_hibits;

 }
 
 static unsigned int x2apic_get_apic_id(unsigned long x)
 }
 
 static unsigned int x2apic_get_apic_id(unsigned long x)


@@ -547,7 +540,7 @@ static unsigned int x2apic_get_apic_id(unsigned long x)
        return id;
 }
 
        return id;
 }
 

-static unsigned long set_apic_id(unsigned int id)
+static u32 set_apic_id(unsigned int id)

 {
        /* CHECKME: Do we need to mask out the xapic extra bits? */
        return id;
 {
        /* CHECKME: Do we need to mask out the xapic extra bits? */
        return id;


@@ -584,12 +577,10 @@ static struct apic apic_x2apic_uv_x __ro_after_init = {
        .irq_delivery_mode              = dest_Fixed,
        .irq_dest_mode                  = 0, /* Physical */
 
        .irq_delivery_mode              = dest_Fixed,
        .irq_dest_mode                  = 0, /* Physical */
 

-       .target_cpus                    = online_target_cpus,

        .disable_esr                    = 0,
        .dest_logical                   = APIC_DEST_LOGICAL,
        .check_apicid_used              = NULL,
 
        .disable_esr                    = 0,
        .dest_logical                   = APIC_DEST_LOGICAL,
        .check_apicid_used              = NULL,
 

-       .vector_allocation_domain       = default_vector_allocation_domain,

        .init_apic_ldr                  = uv_init_apic_ldr,
 
        .ioapic_phys_id_map             = NULL,
        .init_apic_ldr                  = uv_init_apic_ldr,
 
        .ioapic_phys_id_map             = NULL,


@@ -602,7 +593,7 @@ static struct apic apic_x2apic_uv_x __ro_after_init = {
        .get_apic_id                    = x2apic_get_apic_id,
        .set_apic_id                    = set_apic_id,
 
        .get_apic_id                    = x2apic_get_apic_id,
        .set_apic_id                    = set_apic_id,
 

-       .cpu_mask_to_apicid             = uv_cpu_mask_to_apicid,
+       .calc_dest_apicid               = apic_uv_calc_apicid,

 
        .send_IPI                       = uv_send_IPI_one,
        .send_IPI_mask                  = uv_send_IPI_mask,
 
        .send_IPI                       = uv_send_IPI_one,
        .send_IPI_mask                  = uv_send_IPI_mask,