diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 17:52:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 17:52:52 -0400 |
| commit | 32ea89ecb25789b1b7db28146558587a42f3b372 (patch) | |
| tree | c5b3b33523b353f2eab2d8dcd2b3f069826cdc48 /mm/vmalloc.c | |
| parent | 58a7ce64426394a46e80cdc9440cc1e7c195e85d (diff) | |
| parent | a145410dccdb44f81d3b56763ef9b6f721f4e47c (diff) | |
Merge branch 'master'
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 729eb3eec75f..c0504f1e34eb 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
| @@ -321,8 +321,7 @@ void __vunmap(void *addr, int deallocate_pages) | |||
| 321 | int i; | 321 | int i; |
| 322 | 322 | ||
| 323 | for (i = 0; i < area->nr_pages; i++) { | 323 | for (i = 0; i < area->nr_pages; i++) { |
| 324 | if (unlikely(!area->pages[i])) | 324 | BUG_ON(!area->pages[i]); |
| 325 | BUG(); | ||
| 326 | __free_page(area->pages[i]); | 325 | __free_page(area->pages[i]); |
| 327 | } | 326 | } |
| 328 | 327 | ||