From 4a9031b3eb777fced65055ad2667d0ff6078fa31 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Thu, 13 Jan 2011 15:46:17 -0800
Subject: [PATCH] --- yaml --- r: 230732 b: refs/heads/master c:
 e20e87795834f2f14cb53baf657b91d9c39f92c8 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/include/linux/mm.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0cd401b12a4c..6c12257bd521 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 088e54658f559a13c2b988086512d76fe9e8f846
+refs/heads/master: e20e87795834f2f14cb53baf657b91d9c39f92c8
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index 9ade803bcc1b..57e11b2a18ba 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -657,7 +657,7 @@ static inline struct address_space *page_mapping(struct page *page)
 	VM_BUG_ON(PageSlab(page));
 	if (unlikely(PageSwapCache(page)))
 		mapping = &swapper_space;
-	else if (unlikely((unsigned long)mapping & PAGE_MAPPING_ANON))
+	else if ((unsigned long)mapping & PAGE_MAPPING_ANON)
 		mapping = NULL;
 	return mapping;
 }