lkml.org 
[lkml]   [2011]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/5] hugetlb: add phys addr to struct huge_bootmem_page
    Date
    From: Becky Bruce <beckyb@kernel.crashing.org>

    This is needed on HIGHMEM systems - we don't always have a virtual
    address so store the physical address and map it in as needed.

    Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
    ---
    include/linux/hugetlb.h | 3 +++
    mm/hugetlb.c | 8 +++++++-
    2 files changed, 10 insertions(+), 1 deletions(-)

    diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
    index 59225ef..19644e0 100644
    --- a/include/linux/hugetlb.h
    +++ b/include/linux/hugetlb.h
    @@ -231,6 +231,9 @@ struct hstate {
    struct huge_bootmem_page {
    struct list_head list;
    struct hstate *hstate;
    +#ifdef CONFIG_HIGHMEM
    + phys_addr_t phys;
    +#endif
    };

    struct page *alloc_huge_page_node(struct hstate *h, int nid);
    diff --git a/mm/hugetlb.c b/mm/hugetlb.c
    index 6402458..2db81ea 100644
    --- a/mm/hugetlb.c
    +++ b/mm/hugetlb.c
    @@ -1105,8 +1105,14 @@ static void __init gather_bootmem_prealloc(void)
    struct huge_bootmem_page *m;

    list_for_each_entry(m, &huge_boot_pages, list) {
    - struct page *page = virt_to_page(m);
    struct hstate *h = m->hstate;
    +#ifdef CONFIG_HIGHMEM
    + struct page *page = pfn_to_page(m->phys >> PAGE_SHIFT);
    + free_bootmem_late((unsigned long)m,
    + sizeof(struct huge_bootmem_page));
    +#else
    + struct page *page = virt_to_page(m);
    +#endif
    __ClearPageReserved(page);
    WARN_ON(page_count(page) != 1);
    prep_compound_huge_page(page, h->order);
    --
    1.5.6.5


    \
     
     \ /
      Last update: 2011-06-28 22:01    [W:0.020 / U:1.760 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site