lkml.org 
[lkml]   [2007]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    From
    Subject[rfc 11/45] cpu alloc: percpu_counter conversion
    Signed-off-by: Christoph Lameter <clameter@sgi.com>
    ---
    lib/percpu_counter.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    Index: linux-2.6/lib/percpu_counter.c
    ===================================================================
    --- linux-2.6.orig/lib/percpu_counter.c 2007-11-15 21:24:46.878154362 -0800
    +++ linux-2.6/lib/percpu_counter.c 2007-11-15 21:25:28.963154085 -0800
    @@ -20,7 +20,7 @@ void percpu_counter_set(struct percpu_co

    spin_lock(&fbc->lock);
    for_each_possible_cpu(cpu) {
    - s32 *pcount = per_cpu_ptr(fbc->counters, cpu);
    + s32 *pcount = CPU_PTR(fbc->counters, cpu);
    *pcount = 0;
    }
    fbc->count = amount;
    @@ -34,7 +34,7 @@ void __percpu_counter_add(struct percpu_
    s32 *pcount;
    int cpu = get_cpu();

    - pcount = per_cpu_ptr(fbc->counters, cpu);
    + pcount = CPU_PTR(fbc->counters, cpu);
    count = *pcount + amount;
    if (count >= batch || count <= -batch) {
    spin_lock(&fbc->lock);
    @@ -60,7 +60,7 @@ s64 __percpu_counter_sum(struct percpu_c
    spin_lock(&fbc->lock);
    ret = fbc->count;
    for_each_online_cpu(cpu) {
    - s32 *pcount = per_cpu_ptr(fbc->counters, cpu);
    + s32 *pcount = CPU_PTR(fbc->counters, cpu);
    ret += *pcount;
    }
    spin_unlock(&fbc->lock);
    @@ -74,7 +74,7 @@ int percpu_counter_init(struct percpu_co
    {
    spin_lock_init(&fbc->lock);
    fbc->count = amount;
    - fbc->counters = alloc_percpu(s32);
    + fbc->counters = CPU_ALLOC(s32, GFP_KERNEL|__GFP_ZERO);
    if (!fbc->counters)
    return -ENOMEM;
    #ifdef CONFIG_HOTPLUG_CPU
    @@ -101,7 +101,7 @@ void percpu_counter_destroy(struct percp
    if (!fbc->counters)
    return;

    - free_percpu(fbc->counters);
    + CPU_FREE(fbc->counters);
    #ifdef CONFIG_HOTPLUG_CPU
    mutex_lock(&percpu_counters_lock);
    list_del(&fbc->list);
    @@ -127,7 +127,7 @@ static int __cpuinit percpu_counter_hotc
    unsigned long flags;

    spin_lock_irqsave(&fbc->lock, flags);
    - pcount = per_cpu_ptr(fbc->counters, cpu);
    + pcount = CPU_PTR(fbc->counters, cpu);
    fbc->count += *pcount;
    *pcount = 0;
    spin_unlock_irqrestore(&fbc->lock, flags);
    --
    -
    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: 2007-11-20 02:21    [W:0.023 / U:29.232 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site