- mm-hugetlb-get-rid-of-redundant-if-operation.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     mm: hugetlb: remove redundant `if' operation
has been removed from the -mm tree.  Its filename was
     mm-hugetlb-get-rid-of-redundant-if-operation.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: mm: hugetlb: remove redundant `if' operation
From: Cyrill Gorcunov <gorcunov@xxxxxxxxx>

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@xxxxxxxxxxxxxxxxxxxx: use __weak, too]
Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
Reviewed-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/hugetlb.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff -puN mm/hugetlb.c~mm-hugetlb-get-rid-of-redundant-if-operation mm/hugetlb.c
--- a/mm/hugetlb.c~mm-hugetlb-get-rid-of-redundant-if-operation
+++ a/mm/hugetlb.c
@@ -1005,7 +1005,7 @@ static struct page *alloc_huge_page(stru
 	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_
 			 * puts them into the mem_map).
 			 */
 			m = addr;
-			if (m)
-				goto found;
+			goto found;
 		}
 		hstate_next_node(h);
 		nr_nodes--;
_

Patches currently in -mm which might be from gorcunov@xxxxxxxxx are

origin.patch
linux-next.patch
memcg-add-inactive_anon_is_low.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux