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))