diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-22 12:47:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-22 12:47:53 -0700 |
| commit | e5e77cf9f9a275083f9a365a20d956fa8a67803e (patch) | |
| tree | 6597b94038cdcb671b41fb03c199a26e25518e83 /arch/mips/mm/gup.c | |
| parent | b3a297d15b8f1be8304f0e0a3bbbb47b5f019939 (diff) | |
| parent | e376fdf42062e7373b82093b278f99aa2b547db7 (diff) | |
| download | op-kernel-dev-e5e77cf9f9a275083f9a365a20d956fa8a67803e.zip op-kernel-dev-e5e77cf9f9a275083f9a365a20d956fa8a67803e.tar.gz | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"Random fixes across arch/mips, essentially.
One fix for an issue in get_user_pages_fast() which previously was
discovered on x86, a miscalculation in the support for the MIPS MT
hardware multithreading support, the RTC support for the Malta and a
fix for a spurious interrupt issue that seems to bite only very
special Malta configurations."
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: Malta: Don't crash on spurious interrupt.
MIPS: Malta: Remove RTC Data Mode bootstrap breakage
MIPS: mm: Add compound tail page _mapcount when mapped
MIPS: CMP/SMTC: Fix tc_id calculation
Diffstat (limited to 'arch/mips/mm/gup.c')
| -rw-r--r-- | arch/mips/mm/gup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/mm/gup.c b/arch/mips/mm/gup.c index 33aadbc..dcfd573 100644 --- a/arch/mips/mm/gup.c +++ b/arch/mips/mm/gup.c @@ -152,6 +152,8 @@ static int gup_huge_pud(pud_t pud, unsigned long addr, unsigned long end, do { VM_BUG_ON(compound_head(page) != head); pages[*nr] = page; + if (PageTail(page)) + get_huge_page_tail(page); (*nr)++; page++; refs++; |
