From 520feed8a69fba485fdf065b240e246a35a5f609 Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com>
Date: Tue, 29 May 2012 15:06:22 -0700
Subject: [PATCH] --- yaml --- r: 308834 b: refs/heads/master c:
 7edc8b0ac16cbaed7cb4ea4c6b95ce98d2997e84 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/kernel/fork.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3f1b4625f912..499083d37983 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 841e31e5cc6219d62054788faa289b6ed682d068
+refs/heads/master: 7edc8b0ac16cbaed7cb4ea4c6b95ce98d2997e84
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index 5b13eea2e757..017fb23d5983 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -386,7 +386,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
 		}
 		charge = 0;
 		if (mpnt->vm_flags & VM_ACCOUNT) {
-			unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
+			unsigned long len;
+			len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
 			if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
 				goto fail_nomem;
 			charge = len;