mm-commits.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [merged] mm-hugetlb-remove-unused-arch-hook-prepare-release_hugepage.patch removed from -mm tree
@ 2015-06-29 20:39 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2015-06-29 20:39 UTC (permalink / raw)
  To: dingel, borntraeger, heiko.carstens, schwidefsky, mm-commits


The patch titled
     Subject: mm/hugetlb: remove unused arch hook prepare/release_hugepage
has been removed from the -mm tree.  Its filename was
     mm-hugetlb-remove-unused-arch-hook-prepare-release_hugepage.patch

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

------------------------------------------------------
From: Dominik Dingel <dingel@linux.vnet.ibm.com>
Subject: mm/hugetlb: remove unused arch hook prepare/release_hugepage

With s390 dropping support for emulated hugepages, the last user of
arch_prepare_hugepage and arch_release_hugepage is gone.

Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/hugetlb.c |   10 ----------
 1 file changed, 10 deletions(-)

diff -puN mm/hugetlb.c~mm-hugetlb-remove-unused-arch-hook-prepare-release_hugepage mm/hugetlb.c
--- a/mm/hugetlb.c~mm-hugetlb-remove-unused-arch-hook-prepare-release_hugepage
+++ a/mm/hugetlb.c
@@ -975,7 +975,6 @@ static void update_and_free_page(struct
 		destroy_compound_gigantic_page(page, huge_page_order(h));
 		free_gigantic_page(page, huge_page_order(h));
 	} else {
-		arch_release_hugepage(page);
 		__free_pages(page, huge_page_order(h));
 	}
 }
@@ -1160,10 +1159,6 @@ static struct page *alloc_fresh_huge_pag
 						__GFP_REPEAT|__GFP_NOWARN,
 		huge_page_order(h));
 	if (page) {
-		if (arch_prepare_hugepage(page)) {
-			__free_pages(page, huge_page_order(h));
-			return NULL;
-		}
 		prep_new_huge_page(h, page, nid);
 	}
 
@@ -1315,11 +1310,6 @@ static struct page *alloc_buddy_huge_pag
 			htlb_alloc_mask(h)|__GFP_COMP|__GFP_THISNODE|
 			__GFP_REPEAT|__GFP_NOWARN, huge_page_order(h));
 
-	if (page && arch_prepare_hugepage(page)) {
-		__free_pages(page, huge_page_order(h));
-		page = NULL;
-	}

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-06-29 20:39 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-29 20:39 [merged] mm-hugetlb-remove-unused-arch-hook-prepare-release_hugepage.patch removed from -mm tree akpm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).