projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[firefly-linux-kernel-4.4.55.git]
/
mm
/
swap_state.c
diff --git
a/mm/swap_state.c
b/mm/swap_state.c
index e6f15f8ca2af339ce9e90159bae0e6a800f06819..98e85e9c2b2dcd080d7efdc4bfb7521eac0d0b38 100644
(file)
--- a/
mm/swap_state.c
+++ b/
mm/swap_state.c
@@
-83,9
+83,9
@@
int __add_to_swap_cache(struct page *page, swp_entry_t entry)
int error;
struct address_space *address_space;
int error;
struct address_space *address_space;
- VM_BUG_ON
(!PageLocked(page)
);
- VM_BUG_ON
(PageSwapCache(page)
);
- VM_BUG_ON
(!PageSwapBacked(page)
);
+ VM_BUG_ON
_PAGE(!PageLocked(page), page
);
+ VM_BUG_ON
_PAGE(PageSwapCache(page), page
);
+ VM_BUG_ON
_PAGE(!PageSwapBacked(page), page
);
page_cache_get(page);
SetPageSwapCache(page);
page_cache_get(page);
SetPageSwapCache(page);
@@
-139,9
+139,9
@@
void __delete_from_swap_cache(struct page *page)
swp_entry_t entry;
struct address_space *address_space;
swp_entry_t entry;
struct address_space *address_space;
- VM_BUG_ON
(!PageLocked(page)
);
- VM_BUG_ON
(!PageSwapCache(page)
);
- VM_BUG_ON
(PageWriteback(page)
);
+ VM_BUG_ON
_PAGE(!PageLocked(page), page
);
+ VM_BUG_ON
_PAGE(!PageSwapCache(page), page
);
+ VM_BUG_ON
_PAGE(PageWriteback(page), page
);
entry.val = page_private(page);
address_space = swap_address_space(entry);
entry.val = page_private(page);
address_space = swap_address_space(entry);
@@
-165,8
+165,8
@@
int add_to_swap(struct page *page, struct list_head *list)
swp_entry_t entry;
int err;
swp_entry_t entry;
int err;
- VM_BUG_ON
(!PageLocked(page)
);
- VM_BUG_ON
(!PageUptodate(page)
);
+ VM_BUG_ON
_PAGE(!PageLocked(page), page
);
+ VM_BUG_ON
_PAGE(!PageUptodate(page), page
);
entry = get_swap_page();
if (!entry.val)
entry = get_swap_page();
if (!entry.val)