diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
index 1cbf9a44422e4e9d462a8bcd4537d452e2fa5550..4df293c645e1e117c61ad3506de7530ea6b0cf3c 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -456,7 +456,7 @@ static int kernfs_vma_set_policy(struct vm_area_struct *vma,
 }
 
 static struct mempolicy *kernfs_vma_get_policy(struct vm_area_struct *vma,
-					       unsigned long addr)
+					       unsigned long addr, pgoff_t *ilx)
 {
 	struct file *file = vma->vm_file;
 	struct kernfs_open_file *of = kernfs_of(file);
@@ -470,7 +470,7 @@ static struct mempolicy *kernfs_vma_get_policy(struct vm_area_struct *vma,
 
 	pol = vma->vm_policy;
 	if (of->vm_ops->get_policy)
-		pol = of->vm_ops->get_policy(vma, addr);
+		pol = of->vm_ops->get_policy(vma, addr, NULL);
 
 	kernfs_put_active(of->kn);
 	return pol;
diff --git a/include/linux/mm.h b/include/linux/mm.h
index f86fd573a4a144596535673eaf694fbd4bd8a478..49f4fac2dcf76ff8e129618968910dcb27d936cd 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -640,7 +640,7 @@ struct vm_operations_struct {
 	 * policy.
 	 */
 	struct mempolicy *(*get_policy)(struct vm_area_struct *vma,
-					unsigned long addr);
+					unsigned long addr, pgoff_t *ilx);
 #endif
 	/*
 	 * Called by vm_normal_page() for special PTEs to find the
diff --git a/include/linux/sched.h b/include/linux/sched.h
index b65d74c5e765ede2dba075a053fd989202d7b892..f40411aa7b70b3b23fa8207ad5f712953e766dfd 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1285,6 +1285,7 @@ struct task_struct {
 	/* Protected by alloc_lock: */
 	struct mempolicy		*mempolicy;
 	short				il_prev;
+	u8				il_weight;
 	short				pref_node_fork;
 #endif
 #ifdef CONFIG_NUMA_BALANCING
diff --git a/include/uapi/linux/mempolicy.h b/include/uapi/linux/mempolicy.h
index 046d0ccba4cd746c6132ea17e88c6799e08cd1c8..8494de333376224ab6813cdbacef5126d4a714d2 100644
--- a/include/uapi/linux/mempolicy.h
+++ b/include/uapi/linux/mempolicy.h
@@ -23,6 +23,7 @@ enum {
 	MPOL_INTERLEAVE,
 	MPOL_LOCAL,
 	MPOL_PREFERRED_MANY,
+	MPOL_WEIGHTED_INTERLEAVE,
 	MPOL_MAX,	/* always last member of enum */
 };
 
diff --git a/ipc/shm.c b/ipc/shm.c
index 576a543b7cfff9c09187d8605bd3f3086af2a458..0a02bc6d7cdf580d191fe1aa6785ce6996198c59 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -574,14 +574,14 @@ static int shm_set_policy(struct vm_area_struct *vma, struct mempolicy *new)
 }
 
 static struct mempolicy *shm_get_policy(struct vm_area_struct *vma,
-					unsigned long addr)
+					unsigned long addr, pgoff_t *ilx)
 {
 	struct file *file = vma->vm_file;
 	struct shm_file_data *sfd = shm_file_data(file);
 	struct mempolicy *pol = NULL;
 
 	if (sfd->vm_ops->get_policy)
-		pol = sfd->vm_ops->get_policy(vma, addr);
+		pol = sfd->vm_ops->get_policy(vma, addr, NULL);
 	else if (vma->vm_policy)
 		pol = vma->vm_policy;
 
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index a80f9975190473b49a25441916919d697ecee902..17aadb5ca5f748747f3a4d8747c83d29658fd420 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -970,7 +970,7 @@ static long do_get_mempolicy(int *policy, nodemask_t *nmask,
 			return -EFAULT;
 		}
 		if (vma->vm_ops && vma->vm_ops->get_policy)
-			pol = vma->vm_ops->get_policy(vma, addr);
+			pol = vma->vm_ops->get_policy(vma, addr, NULL);
 		else
 			pol = vma->vm_policy;
 	} else if (addr)
@@ -1778,7 +1778,7 @@ struct mempolicy *__get_vma_policy(struct vm_area_struct *vma,
 
 	if (vma) {
 		if (vma->vm_ops && vma->vm_ops->get_policy) {
-			pol = vma->vm_ops->get_policy(vma, addr);
+			pol = vma->vm_ops->get_policy(vma, addr, NULL);
 		} else if (vma->vm_policy) {
 			pol = vma->vm_policy;
 
@@ -1826,7 +1826,7 @@ bool vma_policy_mof(struct vm_area_struct *vma)
 	if (vma->vm_ops && vma->vm_ops->get_policy) {
 		bool ret = false;
 
-		pol = vma->vm_ops->get_policy(vma, vma->vm_start);
+		pol = vma->vm_ops->get_policy(vma, vma->vm_start, NULL);
 		if (pol && (pol->flags & MPOL_F_MOF))
 			ret = true;
 		mpol_cond_put(pol);
diff --git a/mm/shmem.c b/mm/shmem.c
index a7550982a13dd0e3356113390bd60c0e8b3144e3..cf27e1785f8024b7ce5fca0026c4b8b7aab658b0 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2352,7 +2352,7 @@ static int shmem_set_policy(struct vm_area_struct *vma, struct mempolicy *mpol)
 }
 
 static struct mempolicy *shmem_get_policy(struct vm_area_struct *vma,
-					  unsigned long addr)
+					  unsigned long addr, pgoff_t *ilx)
 {
 	struct inode *inode = file_inode(vma->vm_file);
 	pgoff_t index;