X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=mm%2Fhugetlb.c;h=618e98304080a8bdb3ace929c8dcb8938662fad4;hb=1639058ed1dd0b856a5c34064a990c7827b0e32b;hp=82321da23cc36b64a66d1718567a87376461d556;hpb=ebdd4aea8d736e3b5ce27ab0a26860c9fded341b;p=safe%2Fjmp%2Flinux-2.6

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 82321da..618e983 100644
--- a/mm/hugetlb.c
+++ b/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--;