[9610] usbpd change abnormal detection threshold/time

[GitHub/MotorolaMobilityLLC/kernel-slsi.git] / lib / genalloc.c

diff --git a/lib/genalloc.c b/lib/genalloc.c
index 144fe6b1a03ea536893f6e35d153a895a238b67d..ca06adc4f44510d816ddc9911a1ff38f04cd497b 100644 (file)
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -194,7 +194,7 @@ int gen_pool_add_virt(struct gen_pool *pool, unsigned long virt, phys_addr_t phy
        chunk->phys_addr = phys;
        chunk->start_addr = virt;
        chunk->end_addr = virt + size - 1;
-       atomic_set(&chunk->avail, size);
+       atomic_long_set(&chunk->avail, size);
 
        spin_lock(&pool->lock);
        list_add_rcu(&chunk->next_chunk, &pool->chunks);
@@ -304,7 +304,7 @@ unsigned long gen_pool_alloc_algo(struct gen_pool *pool, size_t size,
        nbits = (size + (1UL << order) - 1) >> order;
        rcu_read_lock();
        list_for_each_entry_rcu(chunk, &pool->chunks, next_chunk) {
-               if (size > atomic_read(&chunk->avail))
+               if (size > atomic_long_read(&chunk->avail))
                        continue;
 
                start_bit = 0;
@@ -324,7 +324,7 @@ retry:
 
                addr = chunk->start_addr + ((unsigned long)start_bit << order);
                size = nbits << order;
-               atomic_sub(size, &chunk->avail);
+               atomic_long_sub(size, &chunk->avail);
                break;
        }
        rcu_read_unlock();
@@ -390,7 +390,7 @@ void gen_pool_free(struct gen_pool *pool, unsigned long addr, size_t size)
                        remain = bitmap_clear_ll(chunk->bits, start_bit, nbits);
                        BUG_ON(remain);
                        size = nbits << order;
-                       atomic_add(size, &chunk->avail);
+                       atomic_long_add(size, &chunk->avail);
                        rcu_read_unlock();
                        return;
                }
@@ -464,7 +464,7 @@ size_t gen_pool_avail(struct gen_pool *pool)
 
        rcu_read_lock();
        list_for_each_entry_rcu(chunk, &pool->chunks, next_chunk)
-               avail += atomic_read(&chunk->avail);
+               avail += atomic_long_read(&chunk->avail);
        rcu_read_unlock();
        return avail;
 }