projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.37-rc2' into upstream/xenfs
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
xen
/
mmu.c
diff --git
a/arch/x86/xen/mmu.c
b/arch/x86/xen/mmu.c
index 21ed8d7f75a5aa6fa85970d177979457d6b94d5c..276c67bba5aa6948e1aab8f0ca331cf63bf412fb 100644
(file)
--- a/
arch/x86/xen/mmu.c
+++ b/
arch/x86/xen/mmu.c
@@
-2627,7
+2627,8
@@
int xen_remap_domain_mfn_range(struct vm_area_struct *vma,
prot = __pgprot(pgprot_val(prot) | _PAGE_IOMAP);
- vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
+ BUG_ON(!((vma->vm_flags & (VM_PFNMAP | VM_RESERVED | VM_IO)) ==
+ (VM_PFNMAP | VM_RESERVED | VM_IO)));
rmd.mfn = mfn;
rmd.prot = prot;