projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm/memory-failure.c-failure: send right signal code to correct thread
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
vmalloc.c
diff --git
a/mm/vmalloc.c
b/mm/vmalloc.c
index
e4f0db2
..
0fdf968
100644
(file)
--- a/
mm/vmalloc.c
+++ b/
mm/vmalloc.c
@@
-220,12
+220,12
@@
int is_vmalloc_or_module_addr(const void *x)
}
/*
}
/*
- * Walk a vmap address to the
physical pfn it maps to
.
+ * Walk a vmap address to the
struct page it maps
.
*/
*/
-
unsigned long vmalloc_to_pfn
(const void *vmalloc_addr)
+
struct page *vmalloc_to_page
(const void *vmalloc_addr)
{
unsigned long addr = (unsigned long) vmalloc_addr;
{
unsigned long addr = (unsigned long) vmalloc_addr;
-
unsigned long pfn = 0
;
+
struct page *page = NULL
;
pgd_t *pgd = pgd_offset_k(addr);
/*
pgd_t *pgd = pgd_offset_k(addr);
/*
@@
-244,23
+244,23
@@
unsigned long vmalloc_to_pfn(const void *vmalloc_addr)
ptep = pte_offset_map(pmd, addr);
pte = *ptep;
if (pte_present(pte))
ptep = pte_offset_map(pmd, addr);
pte = *ptep;
if (pte_present(pte))
- p
fn = pte_pfn
(pte);
+ p
age = pte_page
(pte);
pte_unmap(ptep);
}
}
}
pte_unmap(ptep);
}
}
}
- return p
fn
;
+ return p
age
;
}
}
-EXPORT_SYMBOL(vmalloc_to_p
fn
);
+EXPORT_SYMBOL(vmalloc_to_p
age
);
/*
/*
- * Map a vmalloc()-space virtual address to the
struct page
.
+ * Map a vmalloc()-space virtual address to the
physical page frame number
.
*/
*/
-
struct page *vmalloc_to_page
(const void *vmalloc_addr)
+
unsigned long vmalloc_to_pfn
(const void *vmalloc_addr)
{
{
- return p
fn_to_page(vmalloc_to_pfn
(vmalloc_addr));
+ return p
age_to_pfn(vmalloc_to_page
(vmalloc_addr));
}
}
-EXPORT_SYMBOL(vmalloc_to_p
age
);
+EXPORT_SYMBOL(vmalloc_to_p
fn
);
/*** Global kva allocator ***/
/*** Global kva allocator ***/