diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /fs/proc/task_mmu.c | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'fs/proc/task_mmu.c')
| -rw-r--r-- | fs/proc/task_mmu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 7c708a418ac..2e7addfd980 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c | |||
| @@ -182,7 +182,8 @@ static void m_stop(struct seq_file *m, void *v) | |||
| 182 | struct proc_maps_private *priv = m->private; | 182 | struct proc_maps_private *priv = m->private; |
| 183 | struct vm_area_struct *vma = v; | 183 | struct vm_area_struct *vma = v; |
| 184 | 184 | ||
| 185 | vma_stop(priv, vma); | 185 | if (!IS_ERR(vma)) |
| 186 | vma_stop(priv, vma); | ||
| 186 | if (priv->task) | 187 | if (priv->task) |
| 187 | put_task_struct(priv->task); | 188 | put_task_struct(priv->task); |
| 188 | } | 189 | } |