Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b888132b authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

[PATCH] mm: remove memmap_zone_idx() 



memmap_zone_idx() is not used anymore.  It was required by an earlier
version of
account-for-memmap-and-optionally-the-kernel-image-as-holes.patch but not
any more.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6391af17

mm/page_alloc.c

+0 −17
Original line number Original line Diff line number Diff line
@@ -2294,19 +2294,6 @@ unsigned long __init zone_absent_pages_in_node(int nid, 
	return __absent_pages_in_range(nid, zone_start_pfn, zone_end_pfn);

	return __absent_pages_in_range(nid, zone_start_pfn, zone_end_pfn);

}

}





/* Return the zone index a PFN is in */

int memmap_zone_idx(struct page *lmem_map)

{

	int i;

	unsigned long phys_addr = virt_to_phys(lmem_map);

	unsigned long pfn = phys_addr >> PAGE_SHIFT;



	for (i = 0; i < MAX_NR_ZONES; i++)

		if (pfn < arch_zone_highest_possible_pfn[i])

			break;



	return i;

}

#else

#else

static inline unsigned long zone_spanned_pages_in_node(int nid,

static inline unsigned long zone_spanned_pages_in_node(int nid,

					unsigned long zone_type,

					unsigned long zone_type,
@@ -2325,10 +2312,6 @@ static inline unsigned long zone_absent_pages_in_node(int nid, 
	return zholes_size[zone_type];

	return zholes_size[zone_type];

}

}





static inline int memmap_zone_idx(struct page *lmem_map)

{

	return MAX_NR_ZONES;

}

#endif

#endif





static void __init calculate_node_totalpages(struct pglist_data *pgdat,

static void __init calculate_node_totalpages(struct pglist_data *pgdat,