[folded-merged] mm-page_alloc-introduce-free_area_init_core_hotplug-fix.patch removed from -mm tree

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

 



The patch titled
     Subject: mm-page_alloc-introduce-free_area_init_core_hotplug-fix
has been removed from the -mm tree.  Its filename was
     mm-page_alloc-introduce-free_area_init_core_hotplug-fix.patch

This patch was dropped because it was folded into mm-page_alloc-introduce-free_area_init_core_hotplug.patch

------------------------------------------------------
From: Oscar Salvador <osalvador@xxxxxxxxxxxxxxxxxx>
Subject: mm-page_alloc-introduce-free_area_init_core_hotplug-fix

set_pageblock_order() is only called from free_area_init_core() and
sparse_init().  sparse_init() is only called during early init, and the
same applies for free_area_init_core() from now on (with this patchset)

The same goes for calc_memmap_size().

Link: http://lkml.kernel.org/r/20180731101752.GA473@xxxxxxxxxxxxxxxxxx
Cc: Aaron Lu <aaron.lu@xxxxxxxxx>
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Oscar Salvador <osalvador@xxxxxxx>
Cc: Pasha Tatashin <Pavel.Tatashin@xxxxxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/page_alloc.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- a/mm/page_alloc.c~mm-page_alloc-introduce-free_area_init_core_hotplug-fix
+++ a/mm/page_alloc.c
@@ -6143,7 +6143,7 @@ static inline void setup_usemap(struct p
 #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
 
 /* Initialise the number of pages represented by NR_PAGEBLOCK_BITS */
-void __meminit set_pageblock_order(void)
+void __init set_pageblock_order(void)
 {
 	unsigned int order;
 
@@ -6171,14 +6171,14 @@ void __meminit set_pageblock_order(void)
  * include/linux/pageblock-flags.h for the values of pageblock_order based on
  * the kernel config
  */
-void __meminit set_pageblock_order(void)
+void __init set_pageblock_order(void)
 {
 }
 
 #endif /* CONFIG_HUGETLB_PAGE_SIZE_VARIABLE */
 
-static unsigned long __meminit calc_memmap_size(unsigned long spanned_pages,
-						unsigned long present_pages)
+static unsigned long __init calc_memmap_size(unsigned long spanned_pages,
+					     unsigned long present_pages)
 {
 	unsigned long pages = spanned_pages;
 
@@ -6450,7 +6450,7 @@ void __init free_area_init_node(int nid,
  * may be accessed (for example page_to_pfn() on some configuration accesses
  * flags). We must explicitly zero those struct pages.
  */
-void __meminit zero_resv_unavail(void)
+void __init zero_resv_unavail(void)
 {
 	phys_addr_t start, end;
 	unsigned long pfn;
_

Patches currently in -mm which might be from osalvador@xxxxxxxxxxxxxxxxxx are

mm-page_alloc-introduce-free_area_init_core_hotplug.patch




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

  Powered by Linux