lkml.org 
[lkml]   [2008]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/7] x86: make 32bit support per_cpu vector fix #1
    Date
    use cpu_online_map as target cpus for bigsmp. just like 64 bit doing

    also remove some unused TARGET_CPUS macro.

    Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
    ---
    include/asm-x86/bigsmp/apic.h | 15 +++++----------
    include/asm-x86/es7000/apic.h | 3 +--
    include/asm-x86/numaq/apic.h | 2 --
    include/asm-x86/summit/apic.h | 1 -
    4 files changed, 6 insertions(+), 15 deletions(-)

    diff --git a/include/asm-x86/bigsmp/apic.h b/include/asm-x86/bigsmp/apic.h
    index 0a9cd7c..1d9543b 100644
    --- a/include/asm-x86/bigsmp/apic.h
    +++ b/include/asm-x86/bigsmp/apic.h
    @@ -9,22 +9,17 @@ static inline int apic_id_registered(void)
    return (1);
    }

    -/* Round robin the irqs amoung the online cpus */
    static inline cpumask_t target_cpus(void)
    {
    - static unsigned long cpu = NR_CPUS;
    - do {
    - if (cpu >= NR_CPUS)
    - cpu = first_cpu(cpu_online_map);
    - else
    - cpu = next_cpu(cpu, cpu_online_map);
    - } while (cpu >= NR_CPUS);
    - return cpumask_of_cpu(cpu);
    +#ifdef CONFIG_SMP
    + return cpu_online_map;
    +#else
    + return cpumask_of_cpu(0);
    +#endif
    }

    #undef APIC_DEST_LOGICAL
    #define APIC_DEST_LOGICAL 0
    -#define TARGET_CPUS (target_cpus())
    #define APIC_DFR_VALUE (APIC_DFR_FLAT)
    #define INT_DELIVERY_MODE (dest_Fixed)
    #define INT_DEST_MODE (0) /* phys delivery to target proc */
    diff --git a/include/asm-x86/es7000/apic.h b/include/asm-x86/es7000/apic.h
    index bd2c44d..750afad 100644
    --- a/include/asm-x86/es7000/apic.h
    +++ b/include/asm-x86/es7000/apic.h
    @@ -17,7 +17,6 @@ static inline cpumask_t target_cpus(void)
    return cpumask_of_cpu(smp_processor_id());
    #endif
    }
    -#define TARGET_CPUS (target_cpus())

    #if defined CONFIG_ES7000_CLUSTERED_APIC
    #define APIC_DFR_VALUE (APIC_DFR_CLUSTER)
    @@ -81,7 +80,7 @@ static inline void setup_apic_routing(void)
    int apic = per_cpu(x86_bios_cpu_apicid, smp_processor_id());
    printk("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n",
    (apic_version[apic] == 0x14) ?
    - "Physical Cluster" : "Logical Cluster", nr_ioapics, cpus_addr(TARGET_CPUS)[0]);
    + "Physical Cluster" : "Logical Cluster", nr_ioapics, cpus_addr(target_cpus())[0]);
    }

    static inline int multi_timer_check(int apic, int irq)
    diff --git a/include/asm-x86/numaq/apic.h b/include/asm-x86/numaq/apic.h
    index a8344ba..0bf2a06 100644
    --- a/include/asm-x86/numaq/apic.h
    +++ b/include/asm-x86/numaq/apic.h
    @@ -12,8 +12,6 @@ static inline cpumask_t target_cpus(void)
    return CPU_MASK_ALL;
    }

    -#define TARGET_CPUS (target_cpus())
    -
    #define NO_BALANCE_IRQ (1)
    #define esr_disable (1)

    diff --git a/include/asm-x86/summit/apic.h b/include/asm-x86/summit/apic.h
    index c5b2e4b..0f68037 100644
    --- a/include/asm-x86/summit/apic.h
    +++ b/include/asm-x86/summit/apic.h
    @@ -22,7 +22,6 @@ static inline cpumask_t target_cpus(void)
    */
    return cpumask_of_cpu(0);
    }
    -#define TARGET_CPUS (target_cpus())

    #define INT_DELIVERY_MODE (dest_LowestPrio)
    #define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */
    --
    1.5.4.5


    \
     
     \ /
      Last update: 2008-08-15 04:39    [W:0.025 / U:60.616 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site