diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-11-18 09:32:36 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-11-18 09:32:44 +0100 |
| commit | 760a52e80fdf018a9f83a499427923e18e3bd582 (patch) | |
| tree | b37743abb28d9109ce6278b8a896712e713bb25a /include/linux/mempolicy.h | |
| parent | 0395442ad25853f50d515f4dc00e3475b0df920d (diff) | |
| parent | 47b6308b643302e642ca2a5cb6470926f7e1c428 (diff) | |
| download | lwn-760a52e80fdf018a9f83a499427923e18e3bd582.tar.gz lwn-760a52e80fdf018a9f83a499427923e18e3bd582.zip | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
This brings in some mwifiex changes that further patches will
need to work on top to not cause merge conflicts.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/linux/mempolicy.h')
| -rw-r--r-- | include/linux/mempolicy.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h index f230a978e6ba..3d385c81c153 100644 --- a/include/linux/mempolicy.h +++ b/include/linux/mempolicy.h @@ -134,9 +134,10 @@ 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); -bool vma_policy_mof(struct task_struct *task, struct vm_area_struct *vma); +struct mempolicy *get_task_policy(struct task_struct *p); +struct mempolicy *__get_vma_policy(struct vm_area_struct *vma, + unsigned long addr); +bool vma_policy_mof(struct vm_area_struct *vma); extern void numa_default_policy(void); extern void numa_policy_init(void); |