Commit 666feb21 authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds
Browse files

mm, migrate: remove reason argument from new_page_t 

No allocation callback is using this argument anymore.  new_page_node
used to use this parameter to convey node_id resp.  migration error up
to move_pages code (do_move_page_to_node_array).  The error status never
made it into the final status field and we have a better way to
communicate node id to the status field now.  All other allocation
callbacks simply ignored the argument so we can drop it finally.

[mhocko@suse.com: fix migration callback]
  Link: http://lkml.kernel.org/r/20180105085259.GH2801@dhcp22.suse.cz
[akpm@linux-foundation.org: fix alloc_misplaced_dst_page()]
[mhocko@kernel.org: fix build]
  Link: http://lkml.kernel.org/r/20180103091134.GB11319@dhcp22.suse.cz
Link: http://lkml.kernel.org/r/20180103082555.14592-3-mhocko@kernel.org


Signed-off-by: default avatarMichal Hocko <mhocko@suse.com>
Reviewed-by: default avatarZi Yan <zi.yan@cs.rutgers.edu>
Cc: Andrea Reale <ar@linux.vnet.ibm.com>
Cc: Anshuman Khandual <khandual@linux.vnet.ibm.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a49bd4d7

arch/powerpc/mm/mmu_context_iommu.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -75,8 +75,7 @@ EXPORT_SYMBOL_GPL(mm_iommu_preregistered); 
/*

/*

 * Taken from alloc_migrate_target with changes to remove CMA allocations

 * Taken from alloc_migrate_target with changes to remove CMA allocations

 */

 */

struct page *new_iommu_non_cma_page(struct page *page, unsigned long private,

struct page *new_iommu_non_cma_page(struct page *page, unsigned long private)

					int **resultp)

{

{

	gfp_t gfp_mask = GFP_USER;

	gfp_t gfp_mask = GFP_USER;

	struct page *new_page;

	struct page *new_page;

include/linux/migrate.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -7,8 +7,7 @@ 
#include <linux/migrate_mode.h>

#include <linux/migrate_mode.h>

#include <linux/hugetlb.h>

#include <linux/hugetlb.h>





typedef struct page *new_page_t(struct page *page, unsigned long private,

typedef struct page *new_page_t(struct page *page, unsigned long private);

				int **reason);

typedef void free_page_t(struct page *page, unsigned long private);

typedef void free_page_t(struct page *page, unsigned long private);





/*

/*

include/linux/page-isolation.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -63,7 +63,6 @@ undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn, 
int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn,

int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn,

			bool skip_hwpoisoned_pages);

			bool skip_hwpoisoned_pages);





struct page *alloc_migrate_target(struct page *page, unsigned long private,

struct page *alloc_migrate_target(struct page *page, unsigned long private);

				int **resultp);





#endif
 
#endif

mm/compaction.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1166,8 +1166,7 @@ static void isolate_freepages(struct compact_control *cc) 
 * from the isolated freelists in the block we are migrating to.

 * from the isolated freelists in the block we are migrating to.

 */

 */

static struct page *compaction_alloc(struct page *migratepage,

static struct page *compaction_alloc(struct page *migratepage,

					unsigned long data,

					unsigned long data)

					int **result)

{

{

	struct compact_control *cc = (struct compact_control *)data;

	struct compact_control *cc = (struct compact_control *)data;

	struct page *freepage;

	struct page *freepage;

mm/internal.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -538,5 +538,5 @@ static inline bool is_migrate_highatomic_page(struct page *page) 
}

}





void setup_zone_pageset(struct zone *zone);

void setup_zone_pageset(struct zone *zone);

extern struct page *alloc_new_node_page(struct page *page, unsigned long node, int **x);

extern struct page *alloc_new_node_page(struct page *page, unsigned long node);

#endif	/* __MM_INTERNAL_H */
 
#endif	/* __MM_INTERNAL_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE