X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=mm%2Fmlock.c;h=16d2ee160d43c572d5a19ed989b7a8d70df8e9ca;hb=86ac54e79fe09b34c52691a780a6e31d12fa57f4;hp=0d639bf48794dc9787243afe98c10fb2f63408b8;hpb=b0dfd9af28b60d7ec42c359ae84c1ba97e093100;p=linux-2.6-microblaze.git

diff --git a/mm/mlock.c b/mm/mlock.c
index 0d639bf48794..16d2ee160d43 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -23,6 +23,7 @@
 #include <linux/hugetlb.h>
 #include <linux/memcontrol.h>
 #include <linux/mm_inline.h>
+#include <linux/secretmem.h>
 
 #include "internal.h"
 
@@ -503,7 +504,7 @@ static int mlock_fixup(struct vm_area_struct *vma, struct vm_area_struct **prev,
 
 	if (newflags == vma->vm_flags || (vma->vm_flags & VM_SPECIAL) ||
 	    is_vm_hugetlb_page(vma) || vma == get_gate_vma(current->mm) ||
-	    vma_is_dax(vma))
+	    vma_is_dax(vma) || vma_is_secretmem(vma))
 		/* don't set VM_LOCKED or VM_LOCKONFAULT and don't count */
 		goto out;