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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
swap.c
diff --git
a/mm/swap.c
b/mm/swap.c
index
d1100b6
..
b31ba67
100644
(file)
--- a/
mm/swap.c
+++ b/
mm/swap.c
@@
-57,7
+57,7
@@
static void __page_cache_release(struct page *page)
spin_lock_irqsave(&zone->lru_lock, flags);
lruvec = mem_cgroup_page_lruvec(page, zone);
spin_lock_irqsave(&zone->lru_lock, flags);
lruvec = mem_cgroup_page_lruvec(page, zone);
- VM_BUG_ON
(!PageLRU(page)
);
+ VM_BUG_ON
_PAGE(!PageLRU(page), page
);
__ClearPageLRU(page);
del_page_from_lru_list(page, lruvec, page_off_lru(page));
spin_unlock_irqrestore(&zone->lru_lock, flags);
__ClearPageLRU(page);
del_page_from_lru_list(page, lruvec, page_off_lru(page));
spin_unlock_irqrestore(&zone->lru_lock, flags);
@@
-130,8
+130,8
@@
static void put_compound_page(struct page *page)
* __split_huge_page_refcount cannot race
* here.
*/
* __split_huge_page_refcount cannot race
* here.
*/
- VM_BUG_ON
(!PageHead(page_head)
);
- VM_BUG_ON
(page_mapcount(page) != 0
);
+ VM_BUG_ON
_PAGE(!PageHead(page_head), page_head
);
+ VM_BUG_ON
_PAGE(page_mapcount(page) != 0, page
);
if (put_page_testzero(page_head)) {
/*
* If this is the tail of a slab
if (put_page_testzero(page_head)) {
/*
* If this is the tail of a slab
@@
-148,7
+148,7
@@
static void put_compound_page(struct page *page)
* the compound page enters the buddy
* allocator.
*/
* the compound page enters the buddy
* allocator.
*/
- VM_BUG_ON
(PageSlab(page_head)
);
+ VM_BUG_ON
_PAGE(PageSlab(page_head), page_head
);
__put_compound_page(page_head);
}
return;
__put_compound_page(page_head);
}
return;
@@
-199,7
+199,7
@@
out_put_single:
__put_single_page(page);
return;
}
__put_single_page(page);
return;
}
- VM_BUG_ON
(page_head != page->first_
page);
+ VM_BUG_ON
_PAGE(page_head != page->first_page,
page);
/*
* We can release the refcount taken by
* get_page_unless_zero() now that
/*
* We can release the refcount taken by
* get_page_unless_zero() now that
@@
-207,12
+207,12
@@
out_put_single:
* compound_lock.
*/
if (put_page_testzero(page_head))
* compound_lock.
*/
if (put_page_testzero(page_head))
- VM_BUG_ON
(1
);
+ VM_BUG_ON
_PAGE(1, page_head
);
/* __split_huge_page_refcount will wait now */
/* __split_huge_page_refcount will wait now */
- VM_BUG_ON
(page_mapcount(page) <= 0
);
+ VM_BUG_ON
_PAGE(page_mapcount(page) <= 0, page
);
atomic_dec(&page->_mapcount);
atomic_dec(&page->_mapcount);
- VM_BUG_ON
(atomic_read(&page_head->_count) <= 0
);
- VM_BUG_ON
(atomic_read(&page->_count) != 0
);
+ VM_BUG_ON
_PAGE(atomic_read(&page_head->_count) <= 0, page_head
);
+ VM_BUG_ON
_PAGE(atomic_read(&page->_count) != 0, page
);
compound_unlock_irqrestore(page_head, flags);
if (put_page_testzero(page_head)) {
compound_unlock_irqrestore(page_head, flags);
if (put_page_testzero(page_head)) {
@@
-223,7
+223,7
@@
out_put_single:
}
} else {
/* page_head is a dangling pointer */
}
} else {
/* page_head is a dangling pointer */
- VM_BUG_ON
(PageTail(page)
);
+ VM_BUG_ON
_PAGE(PageTail(page), page
);
goto out_put_single;
}
}
goto out_put_single;
}
}
@@
-264,7
+264,7
@@
bool __get_page_tail(struct page *page)
* page. __split_huge_page_refcount
* cannot race here.
*/
* page. __split_huge_page_refcount
* cannot race here.
*/
- VM_BUG_ON
(!PageHead(page_head)
);
+ VM_BUG_ON
_PAGE(!PageHead(page_head), page_head
);
__get_page_tail_foll(page, true);
return true;
} else {
__get_page_tail_foll(page, true);
return true;
} else {
@@
-604,8
+604,8
@@
EXPORT_SYMBOL(__lru_cache_add);
*/
void lru_cache_add(struct page *page)
{
*/
void lru_cache_add(struct page *page)
{
- VM_BUG_ON
(PageActive(page) && PageUnevictable(page)
);
- VM_BUG_ON
(PageLRU(page)
);
+ VM_BUG_ON
_PAGE(PageActive(page) && PageUnevictable(page), page
);
+ VM_BUG_ON
_PAGE(PageLRU(page), page
);
__lru_cache_add(page);
}
__lru_cache_add(page);
}
@@
-846,7
+846,7
@@
void release_pages(struct page **pages, int nr, int cold)
}
lruvec = mem_cgroup_page_lruvec(page, zone);
}
lruvec = mem_cgroup_page_lruvec(page, zone);
- VM_BUG_ON
(!PageLRU(page)
);
+ VM_BUG_ON
_PAGE(!PageLRU(page), page
);
__ClearPageLRU(page);
del_page_from_lru_list(page, lruvec, page_off_lru(page));
}
__ClearPageLRU(page);
del_page_from_lru_list(page, lruvec, page_off_lru(page));
}
@@
-888,9
+888,9
@@
void lru_add_page_tail(struct page *page, struct page *page_tail,
{
const int file = 0;
{
const int file = 0;
- VM_BUG_ON
(!PageHead(page)
);
- VM_BUG_ON
(PageCompound(page_tail)
);
- VM_BUG_ON
(PageLRU(page_tail)
);
+ VM_BUG_ON
_PAGE(!PageHead(page), page
);
+ VM_BUG_ON
_PAGE(PageCompound(page_tail), page
);
+ VM_BUG_ON
_PAGE(PageLRU(page_tail), page
);
VM_BUG_ON(NR_CPUS != 1 &&
!spin_is_locked(&lruvec_zone(lruvec)->lru_lock));
VM_BUG_ON(NR_CPUS != 1 &&
!spin_is_locked(&lruvec_zone(lruvec)->lru_lock));
@@
-929,7
+929,7
@@
static void __pagevec_lru_add_fn(struct page *page, struct lruvec *lruvec,
int active = PageActive(page);
enum lru_list lru = page_lru(page);
int active = PageActive(page);
enum lru_list lru = page_lru(page);
- VM_BUG_ON
(PageLRU(page)
);
+ VM_BUG_ON
_PAGE(PageLRU(page), page
);
SetPageLRU(page);
add_page_to_lru_list(page, lruvec, lru);
SetPageLRU(page);
add_page_to_lru_list(page, lruvec, lru);