---

yaml --- r: 126262 b: refs/heads/master c: 91f4766 h: refs/heads/master v: v3
git-mirror · Jan 6, 2009 · b933194 · b933194
1 parent df3da16
commit b933194
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73ce02e96fe34a983199a9855b2ae738f960a6ee
+refs/heads/master: 91f47662dfaa5b459aebe13284c6c38db27350dc
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
@@ -1005,7 +1005,7 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma,
 	return page;
 }
 
-__attribute__((weak)) int alloc_bootmem_huge_page(struct hstate *h)
+int __weak alloc_bootmem_huge_page(struct hstate *h)
 {
 	struct huge_bootmem_page *m;
 	int nr_nodes = nodes_weight(node_online_map);
@@ -1024,8 +1024,7 @@ __attribute__((weak)) int alloc_bootmem_huge_page(struct hstate *h)
 			 * puts them into the mem_map).
 			 */
 			m = addr;
-			if (m)
-				goto found;
+			goto found;
 		}
 		hstate_next_node(h);
 		nr_nodes--;