lkml.org 
[lkml]   [2010]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] pagemap: add #ifdefs CONFIG_HUGETLB_PAGE on code walking hugetlb vma
    Date
    If !CONFIG_HUGETLB_PAGE, pagemap_hugetlb_range() is never called.
    So put it (and its calling function) into #ifdef block.

    Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
    ---
    fs/proc/task_mmu.c | 4 ++++
    1 files changed, 4 insertions(+), 0 deletions(-)

    diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
    index 183f8ff..2a3ef17 100644
    --- a/fs/proc/task_mmu.c
    +++ b/fs/proc/task_mmu.c
    @@ -652,6 +652,7 @@ static int pagemap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
    return err;
    }

    +#ifdef CONFIG_HUGETLB_PAGE
    static u64 huge_pte_to_pagemap_entry(pte_t pte, int offset)
    {
    u64 pme = 0;
    @@ -695,6 +696,7 @@ static int pagemap_hugetlb_range(pte_t *pte, unsigned long addr,

    return err;
    }
    +#endif /* HUGETLB_PAGE */

    /*
    * /proc/pid/pagemap - an array mapping virtual pages to pfns
    @@ -788,7 +790,9 @@ static ssize_t pagemap_read(struct file *file, char __user *buf,

    pagemap_walk.pmd_entry = pagemap_pte_range;
    pagemap_walk.pte_hole = pagemap_pte_hole;
    +#ifdef CONFIG_HUGETLB_PAGE
    pagemap_walk.hugetlb_entry = pagemap_hugetlb_range;
    +#endif
    pagemap_walk.mm = mm;
    pagemap_walk.private = &pm;

    --
    1.7.0


    \
     
     \ /
      Last update: 2010-03-19 07:31    [W:0.024 / U:0.048 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site