---

yaml --- r: 174854 b: refs/heads/master c: 0067bd8 h: refs/heads/master v: v3
git-mirror · Dec 11, 2009 · a4ec48a · a4ec48a
1 parent 29f0806
commit a4ec48a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 564b3bffc619dcbdd160de597b0547a7017ea010
+refs/heads/master: 0067bd8a55862ac9dd212bd1c4f6f5bff1ca1301
diff --git a/trunk/arch/ia64/ia32/sys_ia32.c b/trunk/arch/ia64/ia32/sys_ia32.c
@@ -858,6 +858,9 @@ ia32_do_mmap (struct file *file, unsigned long addr, unsigned long len, int prot
 
 	prot = get_prot32(prot);
 
+	if (flags & MAP_HUGETLB)
+		return -ENOMEM;
+
 #if PAGE_SHIFT > IA32_PAGE_SHIFT
 	mutex_lock(&ia32_mmap_mutex);
 	{