projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[GRE]: Allow for IPPROTO_GRE protocol in namespaces.
[deliverable/linux.git]
/
mm
/
swap.c
diff --git
a/mm/swap.c
b/mm/swap.c
index 57b7e25a939c41112d20f4f08f22517fcb112580..aa1139ccf3a7ef91d9e93a8aaa21bb340f665716 100644
(file)
--- a/
mm/swap.c
+++ b/
mm/swap.c
@@
-29,6
+29,7
@@
#include <linux/cpu.h>
#include <linux/notifier.h>
#include <linux/backing-dev.h>
#include <linux/cpu.h>
#include <linux/notifier.h>
#include <linux/backing-dev.h>
+#include <linux/memcontrol.h>
/* How many pages do we try to swap or page in/out together? */
int page_cluster;
/* How many pages do we try to swap or page in/out together? */
int page_cluster;
@@
-77,12
+78,11
@@
void put_page(struct page *page)
EXPORT_SYMBOL(put_page);
/**
EXPORT_SYMBOL(put_page);
/**
- * put_pages_list(): release a list of pages
+ * put_pages_list() - release a list of pages
+ * @pages: list of pages threaded on page->lru
*
* Release a list of pages which are strung together on page.lru. Currently
* used by read_cache_pages() and related error recovery code.
*
* Release a list of pages which are strung together on page.lru. Currently
* used by read_cache_pages() and related error recovery code.
- *
- * @pages: list of pages threaded on page->lru
*/
void put_pages_list(struct list_head *pages)
{
*/
void put_pages_list(struct list_head *pages)
{
@@
-175,6
+175,7
@@
void activate_page(struct page *page)
SetPageActive(page);
add_page_to_active_list(zone, page);
__count_vm_event(PGACTIVATE);
SetPageActive(page);
add_page_to_active_list(zone, page);
__count_vm_event(PGACTIVATE);
+ mem_cgroup_move_lists(page, true);
}
spin_unlock_irq(&zone->lru_lock);
}
}
spin_unlock_irq(&zone->lru_lock);
}
This page took
0.026046 seconds
and
5
git commands to generate.