diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-06-27 11:20:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-27 11:20:46 +0200 |
| commit | 8114e90ea4deafc7c75c7b343225b485c21b6706 (patch) | |
| tree | 046c9cd4967e2ea56eab9dcaf6ca6f601fa3deda /arch/sh/include/asm/pgalloc.h | |
| parent | 9840b1ae45876bcca41b64007ac4a56a7cd14c73 (diff) | |
| parent | 4c2e07c6a29e0129e975727b9f57eede813eea85 (diff) | |
| download | linux-stable-8114e90ea4deafc7c75c7b343225b485c21b6706.tar.gz linux-stable-8114e90ea4deafc7c75c7b343225b485c21b6706.tar.bz2 linux-stable-8114e90ea4deafc7c75c7b343225b485c21b6706.zip | |
Merge tag 'v4.7-rc5' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sh/include/asm/pgalloc.h')
| -rw-r--r-- | arch/sh/include/asm/pgalloc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/pgalloc.h b/arch/sh/include/asm/pgalloc.h index a33673b3687d..f3f42c84c40f 100644 --- a/arch/sh/include/asm/pgalloc.h +++ b/arch/sh/include/asm/pgalloc.h @@ -34,7 +34,7 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) { - return quicklist_alloc(QUICK_PT, GFP_KERNEL | __GFP_REPEAT, NULL); + return quicklist_alloc(QUICK_PT, GFP_KERNEL, NULL); } static inline pgtable_t pte_alloc_one(struct mm_struct *mm, @@ -43,7 +43,7 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, struct page *page; void *pg; - pg = quicklist_alloc(QUICK_PT, GFP_KERNEL | __GFP_REPEAT, NULL); + pg = quicklist_alloc(QUICK_PT, GFP_KERNEL, NULL); if (!pg) return NULL; page = virt_to_page(pg); |