From a999c78e3241c195fde515e76633f3850bad0802 Mon Sep 17 00:00:00 2001
From: Richard Knutsson <ricknu-0@student.ltu.se>
Date: Sat, 8 Dec 2007 12:02:48 +0100
Subject: [PATCH] --- yaml --- r: 76091 b: refs/heads/master c:
 88c3f7a8f2c86be264d326cf6f49a3e8c30d13a6 h: refs/heads/master i:   76089:
 c332ee97bdc9b805877260f0e79bad40398f7374   76087:
 42daf756140ff1399b42ea9e419baaa49e5452d7 v: v3

---
 [refs]          | 2 +-
 trunk/mm/mmap.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5db98c0bf11b..c172f680388f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9180a57a9ab2d5525faf8815a332364ee9e89b7
+refs/heads/master: 88c3f7a8f2c86be264d326cf6f49a3e8c30d13a6
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index 15678aa6ec73..bfa389fc6ded 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/mm/mmap.c
@@ -1620,7 +1620,7 @@ static inline int expand_downwards(struct vm_area_struct *vma,
 		return -ENOMEM;
 
 	address &= PAGE_MASK;
-	error = security_file_mmap(0, 0, 0, 0, address, 1);
+	error = security_file_mmap(NULL, 0, 0, 0, address, 1);
 	if (error)
 		return error;
 
@@ -1941,7 +1941,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
 	if (is_hugepage_only_range(mm, addr, len))
 		return -EINVAL;
 
-	error = security_file_mmap(0, 0, 0, 0, addr, 1);
+	error = security_file_mmap(NULL, 0, 0, 0, addr, 1);
 	if (error)
 		return error;