Merge tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6

[mirror_ubuntu-zesty-kernel.git] / include / linux / mempolicy.h

diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index 7c727a90d70da6229afeb9c9cf7c8601841863e2..4aa42732e47f34ca29392180fbee0fc73a086cd2 100644 (file)
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -225,8 +225,8 @@ static inline void check_highest_zone(enum zone_type k)
                policy_zone = k;
 }
 
-int do_migrate_pages(struct mm_struct *mm,
-       const nodemask_t *from_nodes, const nodemask_t *to_nodes, int flags);
+int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from,
+                    const nodemask_t *to, int flags);
 
 
 #ifdef CONFIG_TMPFS
@@ -354,9 +354,8 @@ static inline bool mempolicy_nodemask_intersects(struct task_struct *tsk,
        return false;
 }
 
-static inline int do_migrate_pages(struct mm_struct *mm,
-                       const nodemask_t *from_nodes,
-                       const nodemask_t *to_nodes, int flags)
+static inline int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from,
+                                  const nodemask_t *to, int flags)
 {
        return 0;
 }