Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memory-corruption-check', 'x86/early-printk', 'x86/xsave', 'x86/ptrace-v2', 'x86/quirks', 'x86/setup', 'x86/spinlocks' and 'x86/signal' into x86/core-v2
This commit is contained in:
@@ -180,6 +180,13 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
|
||||
pmd_t *pmd;
|
||||
pte_t *ptep, pte;
|
||||
|
||||
/*
|
||||
* XXX we might need to change this if we add VIRTUAL_BUG_ON for
|
||||
* architectures that do not vmalloc module space
|
||||
*/
|
||||
VIRTUAL_BUG_ON(!is_vmalloc_addr(vmalloc_addr) &&
|
||||
!is_module_address(addr));
|
||||
|
||||
if (!pgd_none(*pgd)) {
|
||||
pud = pud_offset(pgd, addr);
|
||||
if (!pud_none(*pud)) {
|
||||
|
Reference in New Issue
Block a user