From: James Morris <jmorris@namei.org>
Date: Mon, 23 Mar 2009 23:52:46 +0000 (+1100)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=703a3cd72817e99201cef84a8a7aecc60b2b3581;p=linux-edison.git

Merge branch 'master' into next
---

703a3cd72817e99201cef84a8a7aecc60b2b3581
diff --cc mm/mmap.c
index 3b3ed0bb9fd,00ced3ee49a..1abb9185a68
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@@ -1053,12 -1049,8 +1050,11 @@@ unsigned long do_mmap_pgoff(struct fil
  	error = security_file_mmap(file, reqprot, prot, flags, addr, 0);
  	if (error)
  		return error;
 +	error = ima_file_mmap(file, prot);
 +	if (error)
 +		return error;
  
- 	return mmap_region(file, addr, len, flags, vm_flags, pgoff,
- 			   accountable);
+ 	return mmap_region(file, addr, len, flags, vm_flags, pgoff);
  }
  EXPORT_SYMBOL(do_mmap_pgoff);