mm: fix build of split ptlock code

olofj · torvalds · commit 40b64acd17a2 · 2013-12-20T15:41:27.000-08:00
Commit 597d795 ('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: 597d795 ('mm: do not allocate page->ptl dynamically, if spinlock_t fits to long') Signed-off-by: Olof Johansson <olof@lixom.net> Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Hugh Dickins <hughd@google.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/mm/memory.c b/mm/memory.c
@@ -4271,7 +4271,7 @@ void copy_user_huge_page(struct page *dst, struct page *src,
 }
 #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;

Original file line number	Diff line number	Diff line change
`@@ -4271,7 +4271,7 @@ void copy_user_huge_page(struct page dst, struct page src,`
`4271`	`4271`	`}`
`4272`	`4272`	`#endif /* CONFIG_TRANSPARENT_HUGEPAGE \|\| CONFIG_HUGETLBFS */`
`4273`	`4273`
`4274`		`-#if ALLOC_SPLIT_PTLOCKS`
	`4274`	`+#if USE_SPLIT_PTE_PTLOCKS && ALLOC_SPLIT_PTLOCKS`
`4275`	`4275`	`bool ptlock_alloc(struct page *page)`
`4276`	`4276`	`{`
`4277`	`4277`	`spinlock_t *ptl;`