diff options
| author |   Tim Shimmin <tes@chook.melbourne.sgi.com> | 2007-10-11 16:52:59 +1000 |
|---|---|---|
| committer | Tim Shimmin <tes@chook.melbourne.sgi.com> | 2007-10-11 16:52:59 +1000 |
| commit | c1561cf463f4a480d1960e833c8fe628207b24e4 (patch) | |
| tree | b612e5257611ef33196aacc00fba813c943384d5 /mm/hugetlb.c | |
| parent | Revert "[XFS] Avoid replaying inode buffer initialisation log items if on-disk version is newer." (diff) | |
| parent | Linux 2.6.23 (diff) | |
| download | linux-dev-c1561cf463f4a480d1960e833c8fe628207b24e4.tar.xz linux-dev-c1561cf463f4a480d1960e833c8fe628207b24e4.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 84c795ee2d65..eab8c428cc93 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -42,7 +42,7 @@ static void clear_huge_page(struct page *page, unsigned long addr) might_sleep(); for (i = 0; i < (HPAGE_SIZE/PAGE_SIZE); i++) { cond_resched(); - clear_user_highpage(page + i, addr); + clear_user_highpage(page + i, addr + i * PAGE_SIZE); } } |