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
KVM: MIPS: Enable after disabling interrupt
[firefly-linux-kernel-4.4.55.git]
/
mm
/
ksm.c
diff --git
a/mm/ksm.c
b/mm/ksm.c
index 15647fb0394fabc54b10206bf35590aa69b5830c..4162dce2eb44c3aa336a9084f7458d9ac719888e 100644
(file)
--- a/
mm/ksm.c
+++ b/
mm/ksm.c
@@
-1748,7
+1748,7
@@
int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
*/
if (*vm_flags & (VM_MERGEABLE | VM_SHARED | VM_MAYSHARE |
VM_PFNMAP | VM_IO | VM_DONTEXPAND |
- VM_HUGETLB | VM_
NONLINEAR | VM_
MIXEDMAP))
+ VM_HUGETLB | VM_MIXEDMAP))
return 0; /* just ignore the advice */
#ifdef VM_SAO