From f7686ec5010cdd4f5db95182be4c10935e73a478 Mon Sep 17 00:00:00 2001
From: Dean Nelson <dcn@sgi.com>
Date: Tue, 16 Oct 2007 01:24:45 -0700
Subject: [PATCH] --- yaml --- r: 69610 b: refs/heads/master c:
 0da7e01f5f37f441cccd7c8c0586e06db0981907 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 744d2daddbf1..aa6350beef4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2408c55037c3f7d51a8a100025c47595e71b838c
+refs/heads/master: 0da7e01f5f37f441cccd7c8c0586e06db0981907
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index 2a8430844b6d..b3c42f0f65c2 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -2361,7 +2361,7 @@ static int do_linear_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 		int write_access, pte_t orig_pte)
 {
 	pgoff_t pgoff = (((address & PAGE_MASK)
-			- vma->vm_start) >> PAGE_CACHE_SHIFT) + vma->vm_pgoff;
+			- vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
 	unsigned int flags = (write_access ? FAULT_FLAG_WRITE : 0);
 
 	pte_unmap(page_table);