---

yaml --- r: 230732 b: refs/heads/master c: e20e877 h: refs/heads/master v: v3
git-mirror · Jan 14, 2011 · 4a9031b · 4a9031b
1 parent 15e2ea8
commit 4a9031b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 }