projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
page_io.c
diff --git
a/mm/page_io.c
b/mm/page_io.c
index
8c79a47
..
7247be6
100644
(file)
--- a/
mm/page_io.c
+++ b/
mm/page_io.c
@@
-320,8
+320,8
@@
int swap_readpage(struct page *page)
int ret = 0;
struct swap_info_struct *sis = page_swap_info(page);
int ret = 0;
struct swap_info_struct *sis = page_swap_info(page);
- VM_BUG_ON
(!PageLocked(page)
);
- VM_BUG_ON
(PageUptodate(page)
);
+ VM_BUG_ON
_PAGE(!PageLocked(page), page
);
+ VM_BUG_ON
_PAGE(PageUptodate(page), page
);
if (frontswap_load(page) == 0) {
SetPageUptodate(page);
unlock_page(page);
if (frontswap_load(page) == 0) {
SetPageUptodate(page);
unlock_page(page);