summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/pgalloc.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-07-10 17:11:17 +0200
committerIngo Molnar <mingo@kernel.org>2016-07-10 17:11:17 +0200
commit08fb98f5bf95cef902fc30427b39617a6f6875c7 (patch)
treed709cdc500b447bb957fd1e7fbc9073005b8ce8e /arch/arm/include/asm/pgalloc.h
parent99aa22d0d8f70d9317727ab40c85b2ead740a6ca (diff)
parenta017f583ec87d40b06eee6a6beeabe879c8113dd (diff)
Merge branch 'linus' into x86/fpu, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/include/asm/pgalloc.h')
-rw-r--r--arch/arm/include/asm/pgalloc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
index 19cfab526d13..20febb368844 100644
--- a/arch/arm/include/asm/pgalloc.h
+++ b/arch/arm/include/asm/pgalloc.h
@@ -29,7 +29,7 @@
static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
{
- return (pmd_t *)get_zeroed_page(GFP_KERNEL | __GFP_REPEAT);
+ return (pmd_t *)get_zeroed_page(GFP_KERNEL);
}
static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)