From a4ec48a742486abf710aca55c1c11517c9e9586d Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 30 Nov 2009 17:34:06 -0500
Subject: [PATCH] --- yaml --- r: 174854 b: refs/heads/master c:
 0067bd8a55862ac9dd212bd1c4f6f5bff1ca1301 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/ia64/ia32/sys_ia32.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c084fa4b7eb3..9f16e0ce3764 100644
--- 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
index 429ec968c9ee..045b746b9808 100644
--- 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);
 	{