From 25785add8b0f91c62006e8030a8c7543a388ad81 Mon Sep 17 00:00:00 2001
From: Rik van Riel <riel@redhat.com>
Date: Mon, 26 Apr 2010 12:33:03 -0400
Subject: [PATCH] --- yaml --- r: 190264 b: refs/heads/master c:
 5892753383090a3eddf0e1b043c95e3b2c7feda5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 557b276446b7..b10a7fa11338 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a231a1f2714ce3b28445ac512a556d6c95517dab
+refs/heads/master: 5892753383090a3eddf0e1b043c95e3b2c7feda5
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index f90ea92f755a..456ec6f27889 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/mm/mmap.c
@@ -1977,7 +1977,8 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
 		return 0;
 
 	/* Clean everything up if vma_adjust failed. */
-	new->vm_ops->close(new);
+	if (new->vm_ops && new->vm_ops->close)
+		new->vm_ops->close(new);
 	if (new->vm_file) {
 		if (vma->vm_flags & VM_EXECUTABLE)
 			removed_exe_file_vma(mm);