| commit | 2d28a2275c21d04290cfba1555c89a806d2b7706 | [log] [tgz] |
|---|---|---|
| author | Catalin Marinas <[email protected]> | Mon Oct 08 16:32:59 2012 -0700 |
| committer | Linus Torvalds <[email protected]> | Tue Oct 09 16:22:53 2012 +0900 |
| tree | a333aa3c8dd434e8f9ccc6b0f8ff80f9d9b4b357 | |
| parent | e3b4126c556ca3a07699adf202d44bed3f453638 [diff] [blame] |
mm: thp: fix the pmd_clear() arguments in pmdp_get_and_clear() The CONFIG_TRANSPARENT_HUGEPAGE implementation of pmdp_get_and_clear() calls pmd_clear() with 3 arguments instead of 1. This happens only for !__HAVE_ARCH_PMDP_GET_AND_CLEAR which doesn't seem to happen because x86 defines this and it uses pmd_update. [[email protected]: changelog addition] Signed-off-by: Catalin Marinas <[email protected]> Signed-off-by: Steve Capper <[email protected]> Signed-off-by: Will Deacon <[email protected]> Cc: Arnd Bergmann <[email protected]> Reviewed-by: Michal Hocko <[email protected]> Reviewed-by: Kirill A. Shutemov <[email protected]> Cc: Gerald Schaefer <[email protected]> Reviewed-by: Andrea Arcangeli <[email protected]> Cc: Chris Metcalf <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index ebdd74f..b36ce40 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h
@@ -87,7 +87,7 @@ pmd_t *pmdp) { pmd_t pmd = *pmdp; - pmd_clear(mm, address, pmdp); + pmd_clear(pmdp); return pmd; } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */