From f55f35d7d1e3b521a48d6e8cd3ad9f93166a2d98 Mon Sep 17 00:00:00 2001
From: Yuri Tikhonov <yur@emcraft.com>
Date: Mon, 13 Apr 2009 14:40:11 -0700
Subject: [PATCH] --- yaml --- r: 143221 b: refs/heads/master c:
 61609d01cbb3ab865c8cccaf85e6837c47096480 h: refs/heads/master i:   143219:
 f808d60ab905e7f85bb6239ab0f53dd75658a1ad v: v3

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

diff --git a/[refs] b/[refs]
index 2b3e2532789c..f562e9436324 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 347486bb108fa6e0fd2753c1be3519d6be2516ed
+refs/heads/master: 61609d01cbb3ab865c8cccaf85e6837c47096480
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index d94d2e9146bc..28024ce8b8fd 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/mm/shmem.c
@@ -66,7 +66,7 @@ static struct vfsmount *shm_mnt;
 #include <asm/pgtable.h>
 
 #define ENTRIES_PER_PAGE (PAGE_CACHE_SIZE/sizeof(unsigned long))
-#define ENTRIES_PER_PAGEPAGE (ENTRIES_PER_PAGE*ENTRIES_PER_PAGE)
+#define ENTRIES_PER_PAGEPAGE ((unsigned long long)ENTRIES_PER_PAGE*ENTRIES_PER_PAGE)
 #define BLOCKS_PER_PAGE  (PAGE_CACHE_SIZE/512)
 
 #define SHMEM_MAX_INDEX  (SHMEM_NR_DIRECT + (ENTRIES_PER_PAGEPAGE/2) * (ENTRIES_PER_PAGE+1))