| Date | Wed, 16 Oct 2013 10:07:52 +0200 | Subject | Re: [PATCH 19/34] m68k: handle pgtable_page_ctor() fail | From | Geert Uytterhoeven <> |
| |
On Thu, Oct 10, 2013 at 8:05 PM, Kirill A. Shutemov <kirill.shutemov@linux.intel.com> wrote: > Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> > Cc: Geert Uytterhoeven <geert@linux-m68k.org> > --- > arch/m68k/include/asm/motorola_pgalloc.h | 5 ++++- > arch/m68k/include/asm/sun3_pgalloc.h | 5 ++++- > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/arch/m68k/include/asm/motorola_pgalloc.h b/arch/m68k/include/asm/motorola_pgalloc.h > index 2f02f264e6..dd254eeb03 100644 > --- a/arch/m68k/include/asm/motorola_pgalloc.h > +++ b/arch/m68k/include/asm/motorola_pgalloc.h > @@ -40,7 +40,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addres > flush_tlb_kernel_page(pte); > nocache_page(pte); ^^^^^^^^^^^^^^^^^^ > kunmap(page); > - pgtable_page_ctor(page); > + if (!pgtable_page_ctor(page)) { > + __free_page(page);
Shouldn't you mark the page cacheable again, like is done in pte_free()?
> + return NULL; > + } > return page; > } > > diff --git a/arch/m68k/include/asm/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h > index 48d80d5a66..f868506e33 100644 > --- a/arch/m68k/include/asm/sun3_pgalloc.h > +++ b/arch/m68k/include/asm/sun3_pgalloc.h > @@ -59,7 +59,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, > return NULL; > > clear_highpage(page); > - pgtable_page_ctor(page); > + if (!pgtable_page_ctor(page)) { > + __free_page(page); > + return NULL; > + } > return page;
Gr{oetje,eeting}s,
Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
|