From 5ae859771a92e7857e66ce1e940872c627ba4e7d Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Fri, 15 Jun 2012 17:43:22 +0200
Subject: [PATCH] --- yaml --- r: 312227 b: refs/heads/master c:
 ea131377148cdfe90641b42ae9aa5a6b3a4fa327 h: refs/heads/master i:   312225:
 03be2fd8c01a4ad183e9ada0fe86841dedc4ed29   312223:
 7292a6896f9417658bb4821d2a8dc8835917b084 v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/events/uprobes.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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;