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 branch 'devel-stable' into for-next
[firefly-linux-kernel-4.4.55.git]
/
mm
/
madvise.c
diff --git
a/mm/madvise.c
b/mm/madvise.c
index 1077cbdc8b5207a6b407f3b4d97f4f5e99862065..d551475517bfd8867dca18ea23657216a0d2364a 100644
(file)
--- a/
mm/madvise.c
+++ b/
mm/madvise.c
@@
-239,7
+239,7
@@
static long madvise_willneed(struct vm_area_struct *vma,
return -EBADF;
#endif
- if (
file->f_mapping->a_ops->get_xip_mem
) {
+ if (
IS_DAX(file_inode(file))
) {
/* no bad return value, but ignore advice */
return 0;
}