diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-22 11:15:34 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-22 12:51:05 +0000 |
| commit | 28aa2be47924f6b971a6d323b3b4083228c8214f (patch) | |
| tree | 0a8b1ee3d68f262338fb2e9e17badc3557f4f8c4 /mm/memory_hotplug.c | |
| parent | a6b8ad1106ba7e875e1ea94657f19eb0636ce0b2 (diff) | |
| parent | 1f0f80ecae848b0ca2ca632e94568721494f09f0 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-rt-14.11
Conflicts:
include/linux/radix-tree.h
kernel/rcu/tree.c
mm/filemap.c
mm/page_alloc.c
Diffstat (limited to 'mm/memory_hotplug.c')
| -rw-r--r-- | mm/memory_hotplug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index a650db29606f..f6f23833de44 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1332,7 +1332,7 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) * alloc_migrate_target should be improooooved!! * migrate_pages returns # of failed pages. */ - ret = migrate_pages(&source, alloc_migrate_target, 0, + ret = migrate_pages(&source, alloc_migrate_target, NULL, 0, MIGRATE_SYNC, MR_MEMORY_HOTPLUG); if (ret) putback_movable_pages(&source); |