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
Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
huge_memory.c
diff --git
a/mm/huge_memory.c
b/mm/huge_memory.c
index
4df39b1
..
1546655
100644
(file)
--- a/
mm/huge_memory.c
+++ b/
mm/huge_memory.c
@@
-1961,7
+1961,7
@@
out:
return ret;
}
-#define VM_NO_THP (VM_SPECIAL
|VM_MIXEDMAP|VM_HUGETLB|VM_SHARED|
VM_MAYSHARE)
+#define VM_NO_THP (VM_SPECIAL
| VM_HUGETLB | VM_SHARED |
VM_MAYSHARE)
int hugepage_madvise(struct vm_area_struct *vma,
unsigned long *vm_flags, int advice)