|
@@ -1745,8 +1745,7 @@ unsigned int mempolicy_slab_node(void)
|
|
|
* node in pol->v.nodes (starting from n=0), wrapping around if n exceeds the
|
|
|
* number of present nodes.
|
|
|
*/
|
|
|
-static unsigned offset_il_node(struct mempolicy *pol,
|
|
|
- struct vm_area_struct *vma, unsigned long n)
|
|
|
+static unsigned offset_il_node(struct mempolicy *pol, unsigned long n)
|
|
|
{
|
|
|
unsigned nnodes = nodes_weight(pol->v.nodes);
|
|
|
unsigned target;
|
|
@@ -1779,7 +1778,7 @@ static inline unsigned interleave_nid(struct mempolicy *pol,
|
|
|
BUG_ON(shift < PAGE_SHIFT);
|
|
|
off = vma->vm_pgoff >> (shift - PAGE_SHIFT);
|
|
|
off += (addr - vma->vm_start) >> shift;
|
|
|
- return offset_il_node(pol, vma, off);
|
|
|
+ return offset_il_node(pol, off);
|
|
|
} else
|
|
|
return interleave_nodes(pol);
|
|
|
}
|
|
@@ -2247,7 +2246,7 @@ int mpol_misplaced(struct page *page, struct vm_area_struct *vma, unsigned long
|
|
|
|
|
|
pgoff = vma->vm_pgoff;
|
|
|
pgoff += (addr - vma->vm_start) >> PAGE_SHIFT;
|
|
|
- polnid = offset_il_node(pol, vma, pgoff);
|
|
|
+ polnid = offset_il_node(pol, pgoff);
|
|
|
break;
|
|
|
|
|
|
case MPOL_PREFERRED:
|