Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 250933
b: refs/heads/master
c: 9840e37
h: refs/heads/master
i:
  250931: c062a72
v: v3
  • Loading branch information
Stephen Wilson authored and Linus Torvalds committed May 25, 2011
1 parent b7897ca commit 44282d7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 36 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: 722e2ee09b8dfc2ac5eedb802dc0d227702df084
refs/heads/master: 9840e37239183a947a15d617c67e418c6e505dd8
35 changes: 0 additions & 35 deletions trunk/mm/mempolicy.c
Original file line number Diff line number Diff line change
Expand Up @@ -2600,35 +2600,6 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr,
}

#ifdef CONFIG_HUGETLB_PAGE
static void check_huge_range(struct vm_area_struct *vma,
unsigned long start, unsigned long end,
struct numa_maps *md)
{
unsigned long addr;
struct page *page;
struct hstate *h = hstate_vma(vma);
unsigned long sz = huge_page_size(h);

for (addr = start; addr < end; addr += sz) {
pte_t *ptep = huge_pte_offset(vma->vm_mm,
addr & huge_page_mask(h));
pte_t pte;

if (!ptep)
continue;

pte = *ptep;
if (pte_none(pte))
continue;

page = pte_page(pte);
if (!page)
continue;

gather_stats(page, md, pte_dirty(*ptep));
}
}

static int gather_hugetbl_stats(pte_t *pte, unsigned long hmask,
unsigned long addr, unsigned long end, struct mm_walk *walk)
{
Expand All @@ -2648,12 +2619,6 @@ static int gather_hugetbl_stats(pte_t *pte, unsigned long hmask,
}

#else
static inline void check_huge_range(struct vm_area_struct *vma,
unsigned long start, unsigned long end,
struct numa_maps *md)
{
}

static int gather_hugetbl_stats(pte_t *pte, unsigned long hmask,
unsigned long addr, unsigned long end, struct mm_walk *walk)
{
Expand Down

0 comments on commit 44282d7

Please sign in to comment.