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/swap_state.c | |
| parent | 58a7ce64426394a46e80cdc9440cc1e7c195e85d (diff) | |
| parent | a145410dccdb44f81d3b56763ef9b6f721f4e47c (diff) | |
Merge branch 'master'
Diffstat (limited to 'mm/swap_state.c')
| -rw-r--r-- | mm/swap_state.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/swap_state.c b/mm/swap_state.c index d7af296833fc..e0e1583f32c2 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c | |||
| @@ -148,8 +148,7 @@ int add_to_swap(struct page * page, gfp_t gfp_mask) | |||
| 148 | swp_entry_t entry; | 148 | swp_entry_t entry; |
| 149 | int err; | 149 | int err; |
| 150 | 150 | ||
| 151 | if (!PageLocked(page)) | 151 | BUG_ON(!PageLocked(page)); |
| 152 | BUG(); | ||
| 153 | 152 | ||
| 154 | for (;;) { | 153 | for (;;) { |
| 155 | entry = get_swap_page(); | 154 | entry = get_swap_page(); |