On Thu, Apr 28, 2011 at 12:01 PM, KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> wrote: > Adapt new API. > > Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> > Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> > Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> > Cc: linux390@xxxxxxxxxx > Cc: linux-s390@xxxxxxxxxxxxxxx > --- > Âarch/s390/include/asm/tlbflush.h |  Â2 +- > Âarch/s390/kernel/smp.c      |  24 ++++++++++++------------ > Âarch/s390/kernel/time.c     Â|  Â4 ++-- > Âarch/s390/kernel/topology.c   Â|  16 ++++++++-------- > Â4 files changed, 23 insertions(+), 23 deletions(-) > > diff --git a/arch/s390/include/asm/tlbflush.h b/arch/s390/include/asm/tlbflush.h > index 4fdcefc..b7a4f2e 100644 > --- a/arch/s390/include/asm/tlbflush.h > +++ b/arch/s390/include/asm/tlbflush.h > @@ -50,7 +50,7 @@ static inline void __tlb_flush_full(struct mm_struct *mm) >    Â/* >     * If the process only ran on the local cpu, do a local flush. >     */ > -    local_cpumask = cpumask_of_cpu(smp_processor_id()); > +    cpumask_copy(&local_cpumask, cpumask_of(smp_processor_id())); >    Âif (cpumask_equal(mm_cpumask(mm), &local_cpumask)) >        Â__tlb_flush_local(); >    Âelse > diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c > index 63c7d9f..4cc09b8 100644 > --- a/arch/s390/kernel/smp.c > +++ b/arch/s390/kernel/smp.c > @@ -335,7 +335,7 @@ static int smp_rescan_cpus_sigp(cpumask_t avail) >        Âsmp_cpu_polarization[logical_cpu] = POLARIZATION_UNKNWN; >        Âif (!cpu_stopped(logical_cpu)) >            Âcontinue; > -        cpu_set(logical_cpu, cpu_present_map); > +        set_cpu_present(logical_cpu, true); >        Âsmp_cpu_state[logical_cpu] = CPU_STATE_CONFIGURED; >        Âlogical_cpu = cpumask_next(logical_cpu, &avail); >        Âif (logical_cpu >= nr_cpu_ids) > @@ -367,7 +367,7 @@ static int smp_rescan_cpus_sclp(cpumask_t avail) >            Âcontinue; >        Â__cpu_logical_map[logical_cpu] = cpu_id; >        Âsmp_cpu_polarization[logical_cpu] = POLARIZATION_UNKNWN; > -        cpu_set(logical_cpu, cpu_present_map); > +        set_cpu_present(logical_cpu, true); >        Âif (cpu >= info->configured) >            Âsmp_cpu_state[logical_cpu] = CPU_STATE_STANDBY; >        Âelse > @@ -385,7 +385,7 @@ static int __smp_rescan_cpus(void) > Â{ >    Âcpumask_t avail; > > -    cpus_xor(avail, cpu_possible_map, cpu_present_map); > +    cpumask_xor(&avail, cpu_possible_mask, cpu_present_mask); >    Âif (smp_use_sigp_detection) >        Âreturn smp_rescan_cpus_sigp(avail); >    Âelse > @@ -467,7 +467,7 @@ int __cpuinit start_secondary(void *cpuvoid) >    Ânotify_cpu_starting(smp_processor_id()); >    Â/* Mark this cpu as online */ >    Âipi_call_lock(); > -    cpu_set(smp_processor_id(), cpu_online_map); > +    set_cpu_online(smp_processor_id(), true); >    Âipi_call_unlock(); >    Â/* Switch on interrupts */ >    Âlocal_irq_enable(); > @@ -644,7 +644,7 @@ int __cpu_disable(void) >    Âstruct ec_creg_mask_parms cr_parms; >    Âint cpu = smp_processor_id(); > > -    cpu_clear(cpu, cpu_online_map); > +    set_cpu_online(cpu, false); > >    Â/* Disable pfault pseudo page faults on this cpu. */ >    Âpfault_fini(); > @@ -738,8 +738,8 @@ void __init smp_prepare_boot_cpu(void) >    ÂBUG_ON(smp_processor_id() != 0); > >    Âcurrent_thread_info()->cpu = 0; > -    cpu_set(0, cpu_present_map); > -    cpu_set(0, cpu_online_map); > +    set_cpu_present(0, true); > +    set_cpu_online(0, true); >    ÂS390_lowcore.percpu_offset = __per_cpu_offset[0]; >    Âcurrent_set[0] = current; >    Âsmp_cpu_state[0] = CPU_STATE_CONFIGURED; > @@ -1016,21 +1016,21 @@ int __ref smp_rescan_cpus(void) > >    Âget_online_cpus(); >    Âmutex_lock(&smp_cpu_state_mutex); > -    newcpus = cpu_present_map; > +    cpumask_copy(&newcpus, cpu_present_mask); >    Ârc = __smp_rescan_cpus(); >    Âif (rc) >        Âgoto out; > -    cpus_andnot(newcpus, cpu_present_map, newcpus); > -    for_each_cpu_mask(cpu, newcpus) { > +    cpumask_andnot(&newcpus, cpu_present_mask, &newcpus); > +    for_each_cpu(cpu,&newcpus) { please, could you add a space between cpu and ,&newcpus? >        Ârc = smp_add_present_cpu(cpu); >        Âif (rc) > -            cpu_clear(cpu, cpu_present_map); > +            set_cpu_present(cpu, false); >    Â} >    Ârc = 0; > Âout: >    Âmutex_unlock(&smp_cpu_state_mutex); >    Âput_online_cpus(); > -    if (!cpus_empty(newcpus)) > +    if (!cpumask_empty(&newcpus)) >        Âtopology_schedule_update(); >    Âreturn rc; > Â} > diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c > index 87be655..a59557f 100644 > --- a/arch/s390/kernel/time.c > +++ b/arch/s390/kernel/time.c > @@ -810,7 +810,7 @@ static int etr_sync_clock_stop(struct etr_aib *aib, int port) >    Âetr_sync.etr_port = port; >    Âget_online_cpus(); >    Âatomic_set(&etr_sync.cpus, num_online_cpus() - 1); > -    rc = stop_machine(etr_sync_clock, &etr_sync, &cpu_online_map); > +    rc = stop_machine(etr_sync_clock, &etr_sync, cpu_online_mask); >    Âput_online_cpus(); >    Âreturn rc; > Â} > @@ -1579,7 +1579,7 @@ static void stp_work_fn(struct work_struct *work) >    Âmemset(&stp_sync, 0, sizeof(stp_sync)); >    Âget_online_cpus(); >    Âatomic_set(&stp_sync.cpus, num_online_cpus() - 1); > -    stop_machine(stp_sync_clock, &stp_sync, &cpu_online_map); > +    stop_machine(stp_sync_clock, &stp_sync, cpu_online_mask); >    Âput_online_cpus(); > >    Âif (!check_sync_clock()) > diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c > index 94b06c3..2eafb8c 100644 > --- a/arch/s390/kernel/topology.c > +++ b/arch/s390/kernel/topology.c > @@ -52,20 +52,20 @@ static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu) > Â{ >    Âcpumask_t mask; > > -    cpus_clear(mask); > +    cpumask_clear(&mask); >    Âif (!topology_enabled || !MACHINE_HAS_TOPOLOGY) { >        Âcpumask_copy(&mask, cpumask_of(cpu)); >        Âreturn mask; >    Â} >    Âwhile (info) { > -        if (cpu_isset(cpu, info->mask)) { > +        if (cpumask_test_cpu(cpu, &info->mask)) { >            Âmask = info->mask; >            Âbreak; >        Â} >        Âinfo = info->next; >    Â} > -    if (cpus_empty(mask)) > -        mask = cpumask_of_cpu(cpu); > +    if (cpumask_empty(&mask)) > +        cpumask_copy(&mask, cpumask_of(cpu)); >    Âreturn mask; > Â} > > @@ -85,10 +85,10 @@ static void add_cpus_to_mask(struct topology_cpu *tl_cpu, >            Âif (cpu_logical_map(lcpu) != rcpu) >                Âcontinue; > Â#ifdef CONFIG_SCHED_BOOK > -            cpu_set(lcpu, book->mask); > +            cpumask_set_cpu(lcpu, &book->mask); >            Âcpu_book_id[lcpu] = book->id; > Â#endif > -            cpu_set(lcpu, core->mask); > +            cpumask_set_cpu(lcpu, &core->mask); >            Âcpu_core_id[lcpu] = core->id; >            Âsmp_cpu_polarization[lcpu] = tl_cpu->pp; >        Â} > @@ -101,13 +101,13 @@ static void clear_masks(void) > >    Âinfo = &core_info; >    Âwhile (info) { > -        cpus_clear(info->mask); > +        cpumask_clear(&info->mask); >        Âinfo = info->next; >    Â} > Â#ifdef CONFIG_SCHED_BOOK >    Âinfo = &book_info; >    Âwhile (info) { > -        cpus_clear(info->mask); > +        cpumask_clear(&info->mask); >        Âinfo = info->next; >    Â} > Â#endif > -- > 1.7.3.1 > > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at Âhttp://vger.kernel.org/majordomo-info.html > Please read the FAQ at Âhttp://www.tux.org/lkml/ > -- To unsubscribe from this list: send the line "unsubscribe linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html