diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/proc/task_mmu.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 79827ce03e3b..14df8806ff29 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c | |||
@@ -1158,6 +1158,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) | |||
1158 | struct vm_area_struct *vma = v; | 1158 | struct vm_area_struct *vma = v; |
1159 | struct numa_maps *md = &numa_priv->md; | 1159 | struct numa_maps *md = &numa_priv->md; |
1160 | struct file *file = vma->vm_file; | 1160 | struct file *file = vma->vm_file; |
1161 | struct task_struct *task = proc_priv->task; | ||
1161 | struct mm_struct *mm = vma->vm_mm; | 1162 | struct mm_struct *mm = vma->vm_mm; |
1162 | struct mm_walk walk = {}; | 1163 | struct mm_walk walk = {}; |
1163 | struct mempolicy *pol; | 1164 | struct mempolicy *pol; |
@@ -1177,9 +1178,11 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) | |||
1177 | walk.private = md; | 1178 | walk.private = md; |
1178 | walk.mm = mm; | 1179 | walk.mm = mm; |
1179 | 1180 | ||
1180 | pol = get_vma_policy(proc_priv->task, vma, vma->vm_start); | 1181 | task_lock(task); |
1182 | pol = get_vma_policy(task, vma, vma->vm_start); | ||
1181 | mpol_to_str(buffer, sizeof(buffer), pol, 0); | 1183 | mpol_to_str(buffer, sizeof(buffer), pol, 0); |
1182 | mpol_cond_put(pol); | 1184 | mpol_cond_put(pol); |
1185 | task_unlock(task); | ||
1183 | 1186 | ||
1184 | seq_printf(m, "%08lx %s", vma->vm_start, buffer); | 1187 | seq_printf(m, "%08lx %s", vma->vm_start, buffer); |
1185 | 1188 | ||
@@ -1189,7 +1192,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) | |||
1189 | } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { | 1192 | } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { |
1190 | seq_printf(m, " heap"); | 1193 | seq_printf(m, " heap"); |
1191 | } else { | 1194 | } else { |
1192 | pid_t tid = vm_is_stack(proc_priv->task, vma, is_pid); | 1195 | pid_t tid = vm_is_stack(task, vma, is_pid); |
1193 | if (tid != 0) { | 1196 | if (tid != 0) { |
1194 | /* | 1197 | /* |
1195 | * Thread stack in /proc/PID/task/TID/maps or | 1198 | * Thread stack in /proc/PID/task/TID/maps or |