From 68aacfd5ee89adb9869c9755ed59519def830172 Mon Sep 17 00:00:00 2001 From: Stephen Wilson Date: Tue, 24 May 2011 17:12:41 -0700 Subject: [PATCH] --- yaml --- r: 250929 b: refs/heads/master c: d98f6cb67fb5b9376d4957d7ba9f32eac35c2e08 h: refs/heads/master i: 250927: 8d5c52a995d1f507ae36b6c14390ac5e6a446470 v: v3 --- [refs] | 2 +- trunk/include/linux/mempolicy.h | 3 +++ trunk/mm/mempolicy.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d4861ec21e8a..5ac5cc1da695 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c856507f2b2b47a49d8587afb58930b463f6bff4 +refs/heads/master: d98f6cb67fb5b9376d4957d7ba9f32eac35c2e08 diff --git a/trunk/include/linux/mempolicy.h b/trunk/include/linux/mempolicy.h index 31ac26ca4acf..c2f603218fbc 100644 --- a/trunk/include/linux/mempolicy.h +++ b/trunk/include/linux/mempolicy.h @@ -199,6 +199,9 @@ void mpol_free_shared_policy(struct shared_policy *p); struct mempolicy *mpol_shared_policy_lookup(struct shared_policy *sp, unsigned long idx); +struct mempolicy *get_vma_policy(struct task_struct *tsk, + struct vm_area_struct *vma, unsigned long addr); + extern void numa_default_policy(void); extern void numa_policy_init(void); extern void mpol_rebind_task(struct task_struct *tsk, const nodemask_t *new, diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c index 959a8b8c7350..5bfb03ef3cb0 100644 --- a/trunk/mm/mempolicy.c +++ b/trunk/mm/mempolicy.c @@ -1489,7 +1489,7 @@ asmlinkage long compat_sys_mbind(compat_ulong_t start, compat_ulong_t len, * freeing by another task. It is the caller's responsibility to free the * extra reference for shared policies. */ -static struct mempolicy *get_vma_policy(struct task_struct *task, +struct mempolicy *get_vma_policy(struct task_struct *task, struct vm_area_struct *vma, unsigned long addr) { struct mempolicy *pol = task->mempolicy;