Subject: [merged] mm-fix-build-of-split-ptlock-code.patch removed from -mm tree
To: olof@xxxxxxxxx,hughd@xxxxxxxxxx,kirill.shutemov@xxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 26 Dec 2013 13:21:19 -0800
The patch titled
Subject: mm: fix build of split ptlock code
has been removed from the -mm tree. Its filename was
mm-fix-build-of-split-ptlock-code.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Olof Johansson <olof@xxxxxxxxx>
Subject: mm: fix build of split ptlock code
Commit 597d795a2a78 ("mm: do not allocate page->ptl dynamically, if
spinlock_t fits to long") restructures some allocators that are compiled
even if USE_SPLIT_PTLOCKS arn't used. It results in compilation failure:
mm/memory.c:4282:6: error: 'struct page' has no member named 'ptl'
mm/memory.c:4288:12: error: 'struct page' has no member named 'ptl'
Add in the missing ifdef.
Fixes: 597d795a2a78 ('mm: do not allocate page->ptl dynamically, if spinlock_t fits to long')
Signed-off-by: Olof Johansson <olof@xxxxxxxxx>
Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/memory.c~mm-fix-build-of-split-ptlock-code mm/memory.c
--- a/mm/memory.c~mm-fix-build-of-split-ptlock-code
+++ a/mm/memory.c
@@ -4271,7 +4271,7 @@ void copy_user_huge_page(struct page *ds
}
#endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
-#if ALLOC_SPLIT_PTLOCKS
+#if USE_SPLIT_PTE_PTLOCKS && ALLOC_SPLIT_PTLOCKS
bool ptlock_alloc(struct page *page)
{
spinlock_t *ptl;
_
Patches currently in -mm which might be from olof@xxxxxxxxx are
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
