diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:10:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:10:38 -0500 |
| commit | 9f33be2c3a80bdc2cc08342dd77fac87652e0548 (patch) | |
| tree | 7ad6e825427a15c5ec0fc15540abc0429d7f4bce /mm | |
| parent | 2741ecb4ce5c2d430b5c44b0a169038338c21df5 (diff) | |
| parent | eed18b5fa4d297c681b00144e8c6942dd35d39a7 (diff) | |
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 37e69295f250..d55d905463eb 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, | |||
| 555 | } | 555 | } |
| 556 | rcu_read_unlock(); | 556 | rcu_read_unlock(); |
| 557 | 557 | ||
| 558 | if (nr) { | 558 | if (nr) |
| 559 | BUG_ON(nr > atomic_read(&vmap_lazy_nr)); | ||
| 560 | atomic_sub(nr, &vmap_lazy_nr); | 559 | atomic_sub(nr, &vmap_lazy_nr); |
| 561 | } | ||
| 562 | 560 | ||
| 563 | if (nr || force_flush) | 561 | if (nr || force_flush) |
| 564 | flush_tlb_kernel_range(*start, *end); | 562 | flush_tlb_kernel_range(*start, *end); |