summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2013-11-14 14:31:52 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 09:32:20 +0900
commit539edb5846c740d78a8b6c2e43a99ca4323df68f (patch)
treedd03e1a7149f101f42311eac41e2857816cce36c /mm
parent49076ec2ccaf68610aa03d96bced9a6694b93ca1 (diff)
downloadlinux-stable-539edb5846c740d78a8b6c2e43a99ca4323df68f.tar.gz
linux-stable-539edb5846c740d78a8b6c2e43a99ca4323df68f.tar.bz2
linux-stable-539edb5846c740d78a8b6c2e43a99ca4323df68f.zip
mm: properly separate the bloated ptl from the regular case
Use kernel/bounds.c to convert build-time spinlock_t size check into a preprocessor symbol and apply that to properly separate the page::ptl situation. Signed-off-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memory.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 24ffae2a530e..5d9025f3b3e1 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4271,21 +4271,20 @@ void copy_user_huge_page(struct page *dst, struct page *src,
}
#endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
-#if USE_SPLIT_PTE_PTLOCKS
-bool __ptlock_alloc(struct page *page)
+#if USE_SPLIT_PTE_PTLOCKS && BLOATED_SPINLOCKS
+bool ptlock_alloc(struct page *page)
{
spinlock_t *ptl;
ptl = kmalloc(sizeof(spinlock_t), GFP_KERNEL);
if (!ptl)
return false;
- page->ptl = (unsigned long)ptl;
+ page->ptl = ptl;
return true;
}
-void __ptlock_free(struct page *page)
+void ptlock_free(struct page *page)
{
- if (sizeof(spinlock_t) > sizeof(page->ptl))
- kfree((spinlock_t *)page->ptl);
+ kfree(page->ptl);
}
#endif