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
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
mm
/
migrate.c
diff --git
a/mm/migrate.c
b/mm/migrate.c
index
4afd6fe
..
4205b1d
100644
(file)
--- a/
mm/migrate.c
+++ b/
mm/migrate.c
@@
-40,7
+40,8
@@
/*
* migrate_prep() needs to be called before we start compiling a list of pages
/*
* migrate_prep() needs to be called before we start compiling a list of pages
- * to be migrated using isolate_lru_page().
+ * to be migrated using isolate_lru_page(). If scheduling work on other CPUs is
+ * undesirable, use migrate_prep_local()
*/
int migrate_prep(void)
{
*/
int migrate_prep(void)
{
@@
-55,6
+56,14
@@
int migrate_prep(void)
return 0;
}
return 0;
}
+/* Do the necessary work of migrate_prep but not if it involves other CPUs */
+int migrate_prep_local(void)
+{
+ lru_add_drain();
+
+ return 0;
+}
+
/*
* Add isolated pages on the list back to the LRU under page lock
* to avoid leaking evictable pages back onto unevictable list.
/*
* Add isolated pages on the list back to the LRU under page lock
* to avoid leaking evictable pages back onto unevictable list.
@@
-581,7
+590,7
@@
static int unmap_and_move(new_page_t get_new_page, unsigned long private,
}
/* charge against new page */
}
/* charge against new page */
- charge = mem_cgroup_prepare_migration(page, &mem);
+ charge = mem_cgroup_prepare_migration(page,
newpage,
&mem);
if (charge == -ENOMEM) {
rc = -ENOMEM;
goto unlock;
if (charge == -ENOMEM) {
rc = -ENOMEM;
goto unlock;