Subject: + mm-vmalloc-interchage-the-implementation-of-vmalloc_to_pfnpage-fix.patch added to -mm tree To: nasa4836@xxxxxxxxx,murzin.v@xxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 02 Dec 2013 16:01:31 -0800 The patch titled Subject: Re: mm/vmalloc: interchage the implementation of vmalloc_to_{pfn,page} has been added to the -mm tree. Its filename is mm-vmalloc-interchage-the-implementation-of-vmalloc_to_pfnpage-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-vmalloc-interchage-the-implementation-of-vmalloc_to_pfnpage-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-vmalloc-interchage-the-implementation-of-vmalloc_to_pfnpage-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Jianyu Zhan <nasa4836@xxxxxxxxx> Subject: Re: mm/vmalloc: interchage the implementation of vmalloc_to_{pfn,page} I just sent the incorrect patch... it should be - page = pte_page(pte); + pfn = pte_pfn(pte);; Cc: Vladimir Murzin <murzin.v@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/vmalloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN mm/vmalloc.c~mm-vmalloc-interchage-the-implementation-of-vmalloc_to_pfnpage-fix mm/vmalloc.c --- a/mm/vmalloc.c~mm-vmalloc-interchage-the-implementation-of-vmalloc_to_pfnpage-fix +++ a/mm/vmalloc.c @@ -225,7 +225,7 @@ int is_vmalloc_or_module_addr(const void unsigned long vmalloc_to_pfn(const void *vmalloc_addr) { unsigned long addr = (unsigned long) vmalloc_addr; - unsigned long pfn; + unsigned long pfn = 0; pgd_t *pgd = pgd_offset_k(addr); /* @@ -244,7 +244,7 @@ unsigned long vmalloc_to_pfn(const void ptep = pte_offset_map(pmd, addr); pte = *ptep; if (pte_present(pte)) - pfn = pte_page(pte); + pfn = pte_pfn(pte); pte_unmap(ptep); } } _ Patches currently in -mm which might be from nasa4836@xxxxxxxxx are mm-vmalloc-interchage-the-implementation-of-vmalloc_to_pfnpage.patch mm-vmalloc-interchage-the-implementation-of-vmalloc_to_pfnpage-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html