From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 30 Nov 2009 22:34:06 +0000 (-0500)
Subject: Cut hugetlb case early for 32bit on ia64
X-Git-Tag: v2.6.33-rc1~320^2~8
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=0067bd8a55862ac9dd212bd1c4f6f5bff1ca1301;p=safe%2Fjmp%2Flinux-2.6

Cut hugetlb case early for 32bit on ia64

It won't work anyway (hugetlb addresses there are way beyond 4Gb)
and it's easier to stop it here.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index 429ec96..045b746 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/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);
 	{