diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2009-01-06 17:40:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 18:59:10 -0500 |
commit | 91f47662dfaa5b459aebe13284c6c38db27350dc (patch) | |
tree | f2ab72a8be3219b1233e9c63e87f235219df3053 /mm/hugetlb.c | |
parent | 73ce02e96fe34a983199a9855b2ae738f960a6ee (diff) |
mm: hugetlb: remove redundant `if' operation
At this point we already know that 'addr' is not NULL so get rid of
redundant 'if'. Probably gcc eliminate it by optimization pass.
[akpm@linux-foundation.org: use __weak, too]
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/hugetlb.c')
-rw-r--r-- | mm/hugetlb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 82321da23cc..618e9830408 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -1005,7 +1005,7 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma, | |||
1005 | return page; | 1005 | return page; |
1006 | } | 1006 | } |
1007 | 1007 | ||
1008 | __attribute__((weak)) int alloc_bootmem_huge_page(struct hstate *h) | 1008 | int __weak alloc_bootmem_huge_page(struct hstate *h) |
1009 | { | 1009 | { |
1010 | struct huge_bootmem_page *m; | 1010 | struct huge_bootmem_page *m; |
1011 | int nr_nodes = nodes_weight(node_online_map); | 1011 | int nr_nodes = nodes_weight(node_online_map); |
@@ -1024,8 +1024,7 @@ __attribute__((weak)) int alloc_bootmem_huge_page(struct hstate *h) | |||
1024 | * puts them into the mem_map). | 1024 | * puts them into the mem_map). |
1025 | */ | 1025 | */ |
1026 | m = addr; | 1026 | m = addr; |
1027 | if (m) | 1027 | goto found; |
1028 | goto found; | ||
1029 | } | 1028 | } |
1030 | hstate_next_node(h); | 1029 | hstate_next_node(h); |
1031 | nr_nodes--; | 1030 | nr_nodes--; |