projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[firefly-linux-kernel-4.4.55.git]
/
mm
/
memory.c
diff --git
a/mm/memory.c
b/mm/memory.c
index 5d9025f3b3e1cd65bd97655ee95d6cd2f390ce5b..6768ce9e57d29b6d8076b11c62c2097662f334d5 100644
(file)
--- 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 USE_SPLIT_PTE_PTLOCKS &&
BLOATED_SPIN
LOCKS
+#if USE_SPLIT_PTE_PTLOCKS &&
ALLOC_SPLIT_PT
LOCKS
bool ptlock_alloc(struct page *page)
{
spinlock_t *ptl;