diff --git a/[refs] b/[refs] index c8bd4701f4f9..d701dea3a62e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2b297fcf17fc03734e93387fb8195c782286b35 +refs/heads/master: ea131377148cdfe90641b42ae9aa5a6b3a4fa327 diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c index b52376d02332..f0d04530af63 100644 --- a/trunk/kernel/events/uprobes.c +++ b/trunk/kernel/events/uprobes.c @@ -99,7 +99,8 @@ static bool valid_vma(struct vm_area_struct *vma, bool is_register) if (!is_register) return true; - if ((vma->vm_flags & (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)) == (VM_READ|VM_EXEC)) + if ((vma->vm_flags & (VM_HUGETLB|VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)) + == (VM_READ|VM_EXEC)) return true; return false;