diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:10:38 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:10:38 +0000 |
| commit | 9f33be2c3a80bdc2cc08342dd77fac87652e0548 (patch) | |
| tree | 7ad6e825427a15c5ec0fc15540abc0429d7f4bce /mm | |
| parent | 2741ecb4ce5c2d430b5c44b0a169038338c21df5 (diff) | |
| parent | eed18b5fa4d297c681b00144e8c6942dd35d39a7 (diff) | |
| download | op-kernel-dev-9f33be2c3a80bdc2cc08342dd77fac87652e0548.zip op-kernel-dev-9f33be2c3a80bdc2cc08342dd77fac87652e0548.tar.gz | |
Merge branches 'clks' and 'pnx' into devel
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/vmalloc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 37e6929..d55d905 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -555,10 +555,8 @@ static void __purge_vmap_area_lazy(unsigned long *start, unsigned long *end, } rcu_read_unlock(); - if (nr) { - BUG_ON(nr > atomic_read(&vmap_lazy_nr)); + if (nr) atomic_sub(nr, &vmap_lazy_nr); - } if (nr || force_flush) flush_tlb_kernel_range(*start, *end); |
