lkml.org 
[lkml]   [2004]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] cpumask 7/10 remove obsolete cpumask macro uses - i386 arch
    cpumask 7/10 remove obsolete cpumask macro uses - i386 arch

    Remove by recoding i386 uses of the obsolete cpumask const,
    coerce and promote macros.

    arch/i386/kernel/io_apic.c | 2
    arch/i386/kernel/smp.c | 2
    arch/i386/mach-voyager/voyager_smp.c | 30 +++++-----
    include/asm-i386/genapic.h | 2
    include/asm-i386/mach-bigsmp/mach_apic.h | 10 +--
    include/asm-i386/mach-default/mach_apic.h | 10 +--
    include/asm-i386/mach-es7000/mach_apic.h | 10 +--
    include/asm-i386/mach-numaq/mach_apic.h | 2
    include/asm-i386/mach-summit/mach_apic.h | 8 +-
    include/asm-i386/mach-visws/mach_apic.h | 4 -
    10 files changed, 40 insertions(+), 40 deletions(-)

    Signed-off-by: Paul Jackson <pj@sgi.com>

    Index: 2.6.7-rc2-mm2/arch/i386/kernel/io_apic.c
    ===================================================================
    --- 2.6.7-rc2-mm2.orig/arch/i386/kernel/io_apic.c 2004-06-03 06:42:03.000000000 -0700
    +++ 2.6.7-rc2-mm2/arch/i386/kernel/io_apic.c 2004-06-03 07:08:00.000000000 -0700
    @@ -224,7 +224,7 @@
    struct irq_pin_list *entry = irq_2_pin + irq;
    unsigned int apicid_value;

    - apicid_value = cpu_mask_to_apicid(mk_cpumask_const(cpumask));
    + apicid_value = cpu_mask_to_apicid(cpumask);
    /* Prepare to do the io_apic_write */
    apicid_value = apicid_value << 24;
    spin_lock_irqsave(&ioapic_lock, flags);
    Index: 2.6.7-rc2-mm2/arch/i386/kernel/smp.c
    ===================================================================
    --- 2.6.7-rc2-mm2.orig/arch/i386/kernel/smp.c 2004-06-03 06:42:03.000000000 -0700
    +++ 2.6.7-rc2-mm2/arch/i386/kernel/smp.c 2004-06-03 07:08:00.000000000 -0700
    @@ -159,7 +159,7 @@
    */
    inline void send_IPI_mask_bitmask(cpumask_t cpumask, int vector)
    {
    - unsigned long mask = cpus_coerce(cpumask);
    + unsigned long mask = cpus_addr(cpumask)[0];
    unsigned long cfg;
    unsigned long flags;

    Index: 2.6.7-rc2-mm2/arch/i386/mach-voyager/voyager_smp.c
    ===================================================================
    --- 2.6.7-rc2-mm2.orig/arch/i386/mach-voyager/voyager_smp.c 2004-06-03 06:42:03.000000000 -0700
    +++ 2.6.7-rc2-mm2/arch/i386/mach-voyager/voyager_smp.c 2004-06-03 07:08:00.000000000 -0700
    @@ -153,7 +153,7 @@
    send_CPI_allbutself(__u8 cpi)
    {
    __u8 cpu = smp_processor_id();
    - __u32 mask = cpus_coerce(cpu_online_map) & ~(1 << cpu);
    + __u32 mask = cpus_addr(cpu_online_map)[0] & ~(1 << cpu);
    send_CPI(mask, cpi);
    }

    @@ -402,11 +402,11 @@
    /* set up everything for just this CPU, we can alter
    * this as we start the other CPUs later */
    /* now get the CPU disposition from the extended CMOS */
    - phys_cpu_present_map = cpus_promote(voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK));
    - cpus_coerce(phys_cpu_present_map) |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 1) << 8;
    - cpus_coerce(phys_cpu_present_map) |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 2) << 16;
    - cpus_coerce(phys_cpu_present_map) |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 3) << 24;
    - printk("VOYAGER SMP: phys_cpu_present_map = 0x%lx\n", cpus_coerce(phys_cpu_present_map));
    + cpus_addr(phys_cpu_present_map)[0] = voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK);
    + cpus_addr(phys_cpu_present_map)[0] |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 1) << 8;
    + cpus_addr(phys_cpu_present_map)[0] |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 2) << 16;
    + cpus_addr(phys_cpu_present_map)[0] |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 3) << 24;
    + printk("VOYAGER SMP: phys_cpu_present_map = 0x%lx\n", cpus_addr(phys_cpu_present_map)[0]);
    /* Here we set up the VIC to enable SMP */
    /* enable the CPIs by writing the base vector to their register */
    outb(VIC_DEFAULT_CPI_BASE, VIC_CPI_BASE_REGISTER);
    @@ -706,12 +706,12 @@
    /* now that the cat has probed the Voyager System Bus, sanity
    * check the cpu map */
    if( ((voyager_quad_processors | voyager_extended_vic_processors)
    - & cpus_coerce(phys_cpu_present_map)) != cpus_coerce(phys_cpu_present_map)) {
    + & cpus_addr(phys_cpu_present_map)[0]) != cpus_addr(phys_cpu_present_map)[0]) {
    /* should panic */
    printk("\n\n***WARNING*** Sanity check of CPU present map FAILED\n");
    }
    } else if(voyager_level == 4)
    - voyager_extended_vic_processors = cpus_coerce(phys_cpu_present_map);
    + voyager_extended_vic_processors = cpus_addr(phys_cpu_present_map)[0];

    /* this sets up the idle task to run on the current cpu */
    voyager_extended_cpus = 1;
    @@ -909,7 +909,7 @@

    if (!cpumask)
    BUG();
    - if ((cpumask & cpus_coerce(cpu_online_map)) != cpumask)
    + if ((cpumask & cpus_addr(cpu_online_map)[0]) != cpumask)
    BUG();
    if (cpumask & (1 << smp_processor_id()))
    BUG();
    @@ -952,7 +952,7 @@

    preempt_disable();

    - cpu_mask = cpus_coerce(mm->cpu_vm_mask) & ~(1 << smp_processor_id());
    + cpu_mask = cpus_addr(mm->cpu_vm_mask)[0] & ~(1 << smp_processor_id());
    local_flush_tlb();
    if (cpu_mask)
    flush_tlb_others(cpu_mask, mm, FLUSH_ALL);
    @@ -968,7 +968,7 @@

    preempt_disable();

    - cpu_mask = cpus_coerce(mm->cpu_vm_mask) & ~(1 << smp_processor_id());
    + cpu_mask = cpus_addr(mm->cpu_vm_mask)[0] & ~(1 << smp_processor_id());

    if (current->active_mm == mm) {
    if (current->mm)
    @@ -989,7 +989,7 @@

    preempt_disable();

    - cpu_mask = cpus_coerce(mm->cpu_vm_mask) & ~(1 << smp_processor_id());
    + cpu_mask = cpus_addr(mm->cpu_vm_mask)[0] & ~(1 << smp_processor_id());
    if (current->active_mm == mm) {
    if(current->mm)
    __flush_tlb_one(va);
    @@ -1098,7 +1098,7 @@
    int wait)
    {
    struct call_data_struct data;
    - __u32 mask = cpus_coerce(cpu_online_map);
    + __u32 mask = cpus_addr(cpu_online_map)[0];

    mask &= ~(1<<smp_processor_id());

    @@ -1789,9 +1789,9 @@
    unsigned long irq_mask = 1 << irq;
    int cpu;

    - real_mask = cpus_coerce(mask) & voyager_extended_vic_processors;
    + real_mask = cpus_addr(mask)[0] & voyager_extended_vic_processors;

    - if(cpus_coerce(mask) == 0)
    + if(cpus_addr(mask)[0] == 0)
    /* can't have no cpu's to accept the interrupt -- extremely
    * bad things will happen */
    return;
    Index: 2.6.7-rc2-mm2/include/asm-i386/genapic.h
    ===================================================================
    --- 2.6.7-rc2-mm2.orig/include/asm-i386/genapic.h 2004-06-03 06:42:03.000000000 -0700
    +++ 2.6.7-rc2-mm2/include/asm-i386/genapic.h 2004-06-03 07:08:00.000000000 -0700
    @@ -63,7 +63,7 @@

    unsigned (*get_apic_id)(unsigned long x);
    unsigned long apic_id_mask;
    - unsigned int (*cpu_mask_to_apicid)(cpumask_const_t cpumask);
    + unsigned int (*cpu_mask_to_apicid)(cpumask_t cpumask);

    /* ipi */
    void (*send_IPI_mask)(cpumask_t mask, int vector);
    Index: 2.6.7-rc2-mm2/include/asm-i386/mach-bigsmp/mach_apic.h
    ===================================================================
    --- 2.6.7-rc2-mm2.orig/include/asm-i386/mach-bigsmp/mach_apic.h 2004-06-03 06:42:03.000000000 -0700
    +++ 2.6.7-rc2-mm2/include/asm-i386/mach-bigsmp/mach_apic.h 2004-06-03 07:08:00.000000000 -0700
    @@ -28,11 +28,11 @@
    static unsigned long cpu = NR_CPUS;
    do {
    if (cpu >= NR_CPUS)
    - cpu = first_cpu_const(cpu_online_map);
    + cpu = first_cpu(cpu_online_map);
    else
    - cpu = next_cpu_const(cpu, cpu_online_map);
    + cpu = next_cpu(cpu, cpu_online_map);
    } while (cpu >= NR_CPUS);
    - return mk_cpumask_const(cpumask_of_cpu(cpu));
    + return cpumask_of_cpu(cpu);
    }
    #define TARGET_CPUS (target_cpus())

    @@ -150,12 +150,12 @@
    }

    /* As we are using single CPU as destination, pick only one CPU here */
    -static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
    +static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
    {
    int cpu;
    int apicid;

    - cpu = first_cpu_const(cpumask);
    + cpu = first_cpu(cpumask);
    apicid = cpu_to_logical_apicid(cpu);
    return apicid;
    }
    Index: 2.6.7-rc2-mm2/include/asm-i386/mach-default/mach_apic.h
    ===================================================================
    --- 2.6.7-rc2-mm2.orig/include/asm-i386/mach-default/mach_apic.h 2004-06-03 06:42:03.000000000 -0700
    +++ 2.6.7-rc2-mm2/include/asm-i386/mach-default/mach_apic.h 2004-06-03 07:08:00.000000000 -0700
    @@ -5,12 +5,12 @@

    #define APIC_DFR_VALUE (APIC_DFR_FLAT)

    -static inline cpumask_const_t target_cpus(void)
    +static inline cpumask_t target_cpus(void)
    {
    #ifdef CONFIG_SMP
    - return mk_cpumask_const(cpu_online_map);
    + return cpu_online_map;
    #else
    - return mk_cpumask_const(cpumask_of_cpu(0));
    + return cpumask_of_cpu(0);
    #endif
    }
    #define TARGET_CPUS (target_cpus())
    @@ -118,9 +118,9 @@
    return physid_isset(GET_APIC_ID(apic_read(APIC_ID)), phys_cpu_present_map);
    }

    -static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
    +static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
    {
    - return cpus_coerce_const(cpumask);
    + return cpus_addr(cpumask)[0];
    }

    static inline void enable_apic_mode(void)
    Index: 2.6.7-rc2-mm2/include/asm-i386/mach-es7000/mach_apic.h
    ===================================================================
    --- 2.6.7-rc2-mm2.orig/include/asm-i386/mach-es7000/mach_apic.h 2004-06-03 06:42:03.000000000 -0700
    +++ 2.6.7-rc2-mm2/include/asm-i386/mach-es7000/mach_apic.h 2004-06-03 07:08:00.000000000 -0700
    @@ -89,7 +89,7 @@
    int apic = 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_coerce(TARGET_CPUS));
    + "Physical Cluster" : "Logical Cluster", nr_ioapics, cpus_addr(TARGET_CPUS)[0]);
    }

    static inline int multi_timer_check(int apic, int irq)
    @@ -159,14 +159,14 @@
    return (1);
    }

    -static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
    +static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
    {
    int num_bits_set;
    int cpus_found = 0;
    int cpu;
    int apicid;

    - num_bits_set = cpus_weight_const(cpumask);
    + num_bits_set = cpus_weight(cpumask);
    /* Return id to all */
    if (num_bits_set == NR_CPUS)
    #if defined CONFIG_ES7000_CLUSTERED_APIC
    @@ -178,10 +178,10 @@
    * The cpus in the mask must all be on the apic cluster. If are not
    * on the same apicid cluster return default value of TARGET_CPUS.
    */
    - cpu = first_cpu_const(cpumask);
    + cpu = first_cpu(cpumask);
    apicid = cpu_to_logical_apicid(cpu);
    while (cpus_found < num_bits_set) {
    - if (cpu_isset_const(cpu, cpumask)) {
    + if (cpu_isset(cpu, cpumask)) {
    int new_apicid = cpu_to_logical_apicid(cpu);
    if (apicid_cluster(apicid) !=
    apicid_cluster(new_apicid)){
    Index: 2.6.7-rc2-mm2/include/asm-i386/mach-numaq/mach_apic.h
    ===================================================================
    --- 2.6.7-rc2-mm2.orig/include/asm-i386/mach-numaq/mach_apic.h 2004-06-03 06:42:03.000000000 -0700
    +++ 2.6.7-rc2-mm2/include/asm-i386/mach-numaq/mach_apic.h 2004-06-03 07:08:00.000000000 -0700
    @@ -136,7 +136,7 @@
    * We use physical apicids here, not logical, so just return the default
    * physical broadcast to stop people from breaking us
    */
    -static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
    +static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
    {
    return (int) 0xF;
    }
    Index: 2.6.7-rc2-mm2/include/asm-i386/mach-summit/mach_apic.h
    ===================================================================
    --- 2.6.7-rc2-mm2.orig/include/asm-i386/mach-summit/mach_apic.h 2004-06-03 06:42:03.000000000 -0700
    +++ 2.6.7-rc2-mm2/include/asm-i386/mach-summit/mach_apic.h 2004-06-03 07:08:00.000000000 -0700
    @@ -140,14 +140,14 @@
    {
    }

    -static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
    +static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
    {
    int num_bits_set;
    int cpus_found = 0;
    int cpu;
    int apicid;

    - num_bits_set = cpus_weight_const(cpumask);
    + num_bits_set = cpus_weight(cpumask);
    /* Return id to all */
    if (num_bits_set == NR_CPUS)
    return (int) 0xFF;
    @@ -155,10 +155,10 @@
    * The cpus in the mask must all be on the apic cluster. If are not
    * on the same apicid cluster return default value of TARGET_CPUS.
    */
    - cpu = first_cpu_const(cpumask);
    + cpu = first_cpu(cpumask);
    apicid = cpu_to_logical_apicid(cpu);
    while (cpus_found < num_bits_set) {
    - if (cpu_isset_const(cpu, cpumask)) {
    + if (cpu_isset(cpu, cpumask)) {
    int new_apicid = cpu_to_logical_apicid(cpu);
    if (apicid_cluster(apicid) !=
    apicid_cluster(new_apicid)){
    Index: 2.6.7-rc2-mm2/include/asm-i386/mach-visws/mach_apic.h
    ===================================================================
    --- 2.6.7-rc2-mm2.orig/include/asm-i386/mach-visws/mach_apic.h 2004-06-03 06:42:03.000000000 -0700
    +++ 2.6.7-rc2-mm2/include/asm-i386/mach-visws/mach_apic.h 2004-06-03 07:08:00.000000000 -0700
    @@ -84,9 +84,9 @@
    return physid_isset(boot_cpu_physical_apicid, phys_cpu_present_map);
    }

    -static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
    +static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
    {
    - return cpus_coerce_const(cpumask);
    + return cpus_addr(cpumask)[0];
    }

    static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)

    --
    I won't rest till it's the best ...
    Programmer, Linux Scalability
    Paul Jackson <pj@sgi.com> 1.650.933.1373
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-03-22 14:03    [W:0.053 / U:90.572 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site