From 1114d4acbed279fbba50cc57647fe3860ccd942f Mon Sep 17 00:00:00 2001
From: Gavin Lambert <gavinl@compacsort.com>
Date: Sat, 30 Sep 2006 23:27:01 -0700
Subject: [PATCH] --- yaml --- r: 37599 b: refs/heads/master c:
 3fcd03e07008ec0f667dfb7626171165699ea5c2 h: refs/heads/master i:   37597:
 931710fd4dab43a76f096eb1744215327c1ef242   37595:
 a7e452dceaef72c4cec98be42d51a1559458fb91   37591:
 16f98ee49a50d97cb8c356e98f47071736244e24   37583:
 42c0c8b1bfc6b5abf2819c328785c68a3705dbee   37567:
 b705c4e71705000925ac55d31d037a661c7b736d v: v3

---
 [refs]           | 2 +-
 trunk/mm/nommu.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 15fd562ffa84..6479f831c01e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab8e92efcf3f7972f30033cad75f180aef4f3abc
+refs/heads/master: 3fcd03e07008ec0f667dfb7626171165699ea5c2
diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c
index 564540662192..365019599df8 100644
--- a/trunk/mm/nommu.c
+++ b/trunk/mm/nommu.c
@@ -948,7 +948,8 @@ unsigned long do_mmap_pgoff(struct file *file,
 	up_write(&nommu_vma_sem);
 	kfree(vml);
 	if (vma) {
-		fput(vma->vm_file);
+		if (vma->vm_file)
+			fput(vma->vm_file);
 		kfree(vma);
 	}
 	return ret;