From 3c8bdce3c06058b4bc6dd1d6692ee87ff029650d Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 27 Mar 2011 19:09:29 -0700 Subject: [PATCH] --- yaml --- r: 242735 b: refs/heads/master c: 76597cd31470fa130784c78fadb4dab2e624a723 h: refs/heads/master i: 242733: 18d7b3d4420a00cce57b3c10f76586247f993851 242731: 1f2a7ea7388364dca9baf6b4bc4365a743e3de1a 242727: f476a65770a905cc94b27546123b8bcf445cb698 242719: 7591a801c6e6aa3a56666ba43f047536228a47bf v: v3 --- [refs] | 2 +- trunk/fs/proc/task_mmu.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f266f5be9de0..50539af00e15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16c29dafcc86024048f1dbb8349d31cb22c7c55a +refs/heads/master: 76597cd31470fa130784c78fadb4dab2e624a723 diff --git a/trunk/fs/proc/task_mmu.c b/trunk/fs/proc/task_mmu.c index 7c708a418acc..2e7addfd9803 100644 --- a/trunk/fs/proc/task_mmu.c +++ b/trunk/fs/proc/task_mmu.c @@ -182,7 +182,8 @@ static void m_stop(struct seq_file *m, void *v) struct proc_maps_private *priv = m->private; struct vm_area_struct *vma = v; - vma_stop(priv, vma); + if (!IS_ERR(vma)) + vma_stop(priv, vma); if (priv->task) put_task_struct(priv->task); }