From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 25 Apr 2012 01:03:40 +0000 (+1000)
Subject: mm-mmapc-find_vma-remove-unnecessary-ifmm-check-fix
X-Git-Tag: next-20120430~2^2~129
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fbaf8df152ada79942e03d5a7eca2803b1b37c92;p=karo-tx-linux.git

mm-mmapc-find_vma-remove-unnecessary-ifmm-check-fix

add remove-me comment

Cc: Hugh Dickins <hughd@google.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Kautuk Consul <consul.kautuk@gmail.com>
Cc: Rajman Mekaco <rajman.mekaco@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/mmap.c b/mm/mmap.c
index f9c4f02eabde..1b6ff9657949 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1639,7 +1639,7 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
 {
 	struct vm_area_struct *vma = NULL;
 
-	if (WARN_ON_ONCE(!mm))
+	if (WARN_ON_ONCE(!mm))		/* Remove this in linux-3.6 */
 		return NULL;
 
 	/* Check the cache first. */