aboutsummaryrefslogtreecommitdiffstats
path: root/mm/vmalloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/vmalloc.c')
-rw-r--r--mm/vmalloc.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 712ae47af0bf..0797589d51f8 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -175,6 +175,21 @@ static int vmap_page_range(unsigned long addr, unsigned long end,
175 return nr; 175 return nr;
176} 176}
177 177
178static inline int is_vmalloc_or_module_addr(const void *x)
179{
180 /*
181 * x86-64 and sparc64 put modules in a special place,
182 * and fall back on vmalloc() if that fails. Others
183 * just put it in the vmalloc space.
184 */
185#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
186 unsigned long addr = (unsigned long)x;
187 if (addr >= MODULES_VADDR && addr < MODULES_END)
188 return 1;
189#endif
190 return is_vmalloc_addr(x);
191}
192
178/* 193/*
179 * Walk a vmap address to the struct page it maps. 194 * Walk a vmap address to the struct page it maps.
180 */ 195 */
@@ -188,8 +203,7 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
188 * XXX we might need to change this if we add VIRTUAL_BUG_ON for 203 * XXX we might need to change this if we add VIRTUAL_BUG_ON for
189 * architectures that do not vmalloc module space 204 * architectures that do not vmalloc module space
190 */ 205 */
191 VIRTUAL_BUG_ON(!is_vmalloc_addr(vmalloc_addr) && 206 VIRTUAL_BUG_ON(!is_vmalloc_or_module_addr(vmalloc_addr));
192 !is_module_address(addr));
193 207
194 if (!pgd_none(*pgd)) { 208 if (!pgd_none(*pgd)) {
195 pud_t *pud = pud_offset(pgd, addr); 209 pud_t *pud = pud_offset(pgd, addr);