From mboxrd@z Thu Jan 1 00:00:00 1970 Date: Wed, 15 Aug 2007 12:43:26 -0500 Subject: [PATCH] calculation of pgoff in do_linear_fault() uses mixed units Message-ID: <46C33B3E.mailxBSH11HDLW@aqua.americas.sgi.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit From: dcn@sgi.com (Dean Nelson) Sender: owner-linux-mm@kvack.org Return-Path: To: akpm@linux-foundation.org Cc: npiggin@suse.de, linux-mm@kvack.org, linux-kernel@vger.kernel.org List-ID: The calculation of pgoff in do_linear_fault() should use PAGE_SHIFT and not PAGE_CACHE_SHIFT since vma->vm_pgoff is in units of PAGE_SIZE and not PAGE_CACHE_SIZE. At the moment linux/pagemap.h has PAGE_CACHE_SHIFT defined as PAGE_SHIFT, but should that ever change this calculation would break. Signed-off-by: Dean Nelson Index: linux-2.6/mm/memory.c =================================================================== --- linux-2.6.orig/mm/memory.c 2007-08-14 06:42:18.322378070 -0500 +++ linux-2.6/mm/memory.c 2007-08-15 12:30:51.621604739 -0500 @@ -2465,7 +2465,7 @@ 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); return __do_fault(mm, vma, address, page_table, pmd, pgoff, -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org