From 7e35477423db83156b71c4617b3c691a8355fd89 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Sun, 8 Jan 2006 01:01:03 -0800 Subject: [PATCH] --- yaml --- r: 16853 b: refs/heads/master c: 48fce3429df84a94766fbbc845fa8450d0715b48 h: refs/heads/master i: 16851: bda2918951c029eb1b745c822fdafec5564e90c8 v: v3 --- [refs] | 2 +- trunk/include/linux/mempolicy.h | 3 --- trunk/mm/mempolicy.c | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 34de4ec2775d..e398721fd0c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 132beacf9785d2e6e8aecb59aa078f3ca5668fa6 +refs/heads/master: 48fce3429df84a94766fbbc845fa8450d0715b48 diff --git a/trunk/include/linux/mempolicy.h b/trunk/include/linux/mempolicy.h index 66247eff24a0..05fddd5bee5d 100644 --- a/trunk/include/linux/mempolicy.h +++ b/trunk/include/linux/mempolicy.h @@ -144,9 +144,6 @@ 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 *task, - struct vm_area_struct *vma, unsigned long addr); - extern void numa_default_policy(void); extern void numa_policy_init(void); extern void numa_policy_rebind(const nodemask_t *old, const nodemask_t *new); diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c index 4c0510e9e7f6..4b077ec6c005 100644 --- a/trunk/mm/mempolicy.c +++ b/trunk/mm/mempolicy.c @@ -935,8 +935,8 @@ asmlinkage long compat_sys_mbind(compat_ulong_t start, compat_ulong_t len, #endif /* Return effective policy for a VMA */ -struct mempolicy * -get_vma_policy(struct task_struct *task, struct vm_area_struct *vma, unsigned long addr) +static struct mempolicy * get_vma_policy(struct task_struct *task, + struct vm_area_struct *vma, unsigned long addr) { struct mempolicy *pol = task->mempolicy;