The patch titled
calculation of pgoff in do_linear_fault() uses mixed units
has been removed from the -mm tree. Its filename was
calculation-of-pgoff-in-do_linear_fault-uses-mixed.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: calculation of pgoff in do_linear_fault() uses mixed units
From: Dean Nelson <dcn@xxxxxxx>
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 <dcn@xxxxxxx>
Acked-by: Nick Piggin <npiggin@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/memory.c~calculation-of-pgoff-in-do_linear_fault-uses-mixed mm/memory.c
--- a/mm/memory.c~calculation-of-pgoff-in-do_linear_fault-uses-mixed
+++ a/mm/memory.c
@@ -2361,7 +2361,7 @@ static int do_linear_fault(struct mm_str
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);
_
Patches currently in -mm which might be from dcn@xxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
