Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 39281
b: refs/heads/master
c: b888132
h: refs/heads/master
i:
  39279: 51a8bb3
v: v3
  • Loading branch information
Mel Gorman authored and Linus Torvalds committed Oct 11, 2006
1 parent 9ec58eb commit ada11d4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6391af174ad75f72e92043c1dd8302660a2fec58
refs/heads/master: b888132b0ff29ca0733589a594c243ed612438eb
17 changes: 0 additions & 17 deletions trunk/mm/page_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 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
static inline unsigned long zone_spanned_pages_in_node(int nid,
unsigned long zone_type,
Expand All @@ -2325,10 +2312,6 @@ static inline unsigned long zone_absent_pages_in_node(int nid,
return zholes_size[zone_type];
}

static inline int memmap_zone_idx(struct page *lmem_map)
{
return MAX_NR_ZONES;
}
#endif

static void __init calculate_node_totalpages(struct pglist_data *pgdat,
Expand Down

0 comments on commit ada11d4

Please sign in to comment.