diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /mm/memory.c | |
parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index c256175742ac..beabdefa6254 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -1139,7 +1139,7 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr, | |||
1139 | { | 1139 | { |
1140 | pgd_t *pgd; | 1140 | pgd_t *pgd; |
1141 | unsigned long next; | 1141 | unsigned long next; |
1142 | unsigned long end = addr + size; | 1142 | unsigned long end = addr + PAGE_ALIGN(size); |
1143 | struct mm_struct *mm = vma->vm_mm; | 1143 | struct mm_struct *mm = vma->vm_mm; |
1144 | int err; | 1144 | int err; |
1145 | 1145 | ||