git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
omap2+: add drm device
[pandora-kernel.git]
/
mm
/
swap.c
diff --git
a/mm/swap.c
b/mm/swap.c
index
a91caf7
..
330463b
100644
(file)
--- a/
mm/swap.c
+++ b/
mm/swap.c
@@
-585,11
+585,10
@@
int lru_add_drain_all(void)
void release_pages(struct page **pages, int nr, int cold)
{
int i;
void release_pages(struct page **pages, int nr, int cold)
{
int i;
-
struct pagevec pages_to_free
;
+
LIST_HEAD(pages_to_free)
;
struct zone *zone = NULL;
unsigned long uninitialized_var(flags);
struct zone *zone = NULL;
unsigned long uninitialized_var(flags);
- pagevec_init(&pages_to_free, cold);
for (i = 0; i < nr; i++) {
struct page *page = pages[i];
for (i = 0; i < nr; i++) {
struct page *page = pages[i];
@@
-620,19
+619,12
@@
void release_pages(struct page **pages, int nr, int cold)
del_page_from_lru(zone, page);
}
del_page_from_lru(zone, page);
}
- if (!pagevec_add(&pages_to_free, page)) {
- if (zone) {
- spin_unlock_irqrestore(&zone->lru_lock, flags);
- zone = NULL;
- }
- __pagevec_free(&pages_to_free);
- pagevec_reinit(&pages_to_free);
- }
+ list_add(&page->lru, &pages_to_free);
}
if (zone)
spin_unlock_irqrestore(&zone->lru_lock, flags);
}
if (zone)
spin_unlock_irqrestore(&zone->lru_lock, flags);
-
pagevec_free(&pages_to_free
);
+
free_hot_cold_page_list(&pages_to_free, cold
);
}
EXPORT_SYMBOL(release_pages);
}
EXPORT_SYMBOL(release_pages);
@@
-667,7
+659,7
@@
void lru_add_page_tail(struct zone* zone,
VM_BUG_ON(!PageHead(page));
VM_BUG_ON(PageCompound(page_tail));
VM_BUG_ON(PageLRU(page_tail));
VM_BUG_ON(!PageHead(page));
VM_BUG_ON(PageCompound(page_tail));
VM_BUG_ON(PageLRU(page_tail));
- VM_BUG_ON(!spin_is_locked(&zone->lru_lock));
+ VM_BUG_ON(
NR_CPUS != 1 &&
!spin_is_locked(&zone->lru_lock));
SetPageLRU(page_tail);
SetPageLRU(page_tail);