aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2009-11-30 17:34:06 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2009-12-11 06:34:10 -0500
commit0067bd8a55862ac9dd212bd1c4f6f5bff1ca1301 (patch)
tree85e4ba1eac7d0e5b15cdf87a184669ca044b0304
parent564b3bffc619dcbdd160de597b0547a7017ea010 (diff)
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>
-rw-r--r--arch/ia64/ia32/sys_ia32.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index 429ec968c9e..045b746b980 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);
{