summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/gup.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-12-18 10:35:16 +0100
committerIngo Molnar <mingo@elte.hu>2011-12-18 10:35:16 +0100
commit6e5ed276374c329b93a968d640f4d26c8c05411b (patch)
tree3b0d42269f0f52ea7764511de3a58b01d12bcb23 /arch/x86/mm/gup.c
parentx86/mrst: Add additional debug prints for pb_keys (diff)
parentLinux 3.2-rc6 (diff)
downloadlinux-6e5ed276374c329b93a968d640f4d26c8c05411b.tar.xz
linux-6e5ed276374c329b93a968d640f4d26c8c05411b.zip
Merge commit 'v3.2-rc6' into x86/platform
Diffstat (limited to 'arch/x86/mm/gup.c')
-rw-r--r--arch/x86/mm/gup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
index ea305856151c..dd74e46828c0 100644
--- a/arch/x86/mm/gup.c
+++ b/arch/x86/mm/gup.c
@@ -201,6 +201,8 @@ static noinline int gup_huge_pud(pud_t pud, unsigned long addr,
do {
VM_BUG_ON(compound_head(page) != head);
pages[*nr] = page;
+ if (PageTail(page))
+ get_huge_page_tail(page);
(*nr)++;
page++;
refs++;