diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-09 10:43:49 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-09 10:43:49 +0200 |
| commit | 52e31f89cc40c613b22e62108fe12b27433a888e (patch) | |
| tree | c3cd45d6950706c32efdd341715e70b6ee6d7a5e /arch/x86/include/asm/pgalloc.h | |
| parent | 9a7e7b571826c4399aa639af4a670642d96d935c (diff) | |
| parent | ee40fb2948fc99096836995d4f3ddcc0efbac790 (diff) | |
| download | op-kernel-dev-52e31f89cc40c613b22e62108fe12b27433a888e.zip op-kernel-dev-52e31f89cc40c613b22e62108fe12b27433a888e.tar.gz | |
Merge branch 'linus' into x86/asm, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/pgalloc.h')
| -rw-r--r-- | arch/x86/include/asm/pgalloc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h index bf7f8b5..574c23c 100644 --- a/arch/x86/include/asm/pgalloc.h +++ b/arch/x86/include/asm/pgalloc.h @@ -81,7 +81,7 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr) { struct page *page; - page = alloc_pages(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO, 0); + page = alloc_pages(GFP_KERNEL | __GFP_ZERO, 0); if (!page) return NULL; if (!pgtable_pmd_page_ctor(page)) { @@ -125,7 +125,7 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud) static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr) { - return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT); + return (pud_t *)get_zeroed_page(GFP_KERNEL); } static inline void pud_free(struct mm_struct *mm, pud_t *pud) |
