diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-08 19:19:38 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-08 19:19:38 +1100 |
commit | 28ac55b70ccf4908ad75126b30171383165b2827 (patch) | |
tree | ee9ef851fe80058a7341ee18db175dc5c49871ab /arch/metag/include/asm/pgalloc.h | |
parent | 3439e34f56f4bf62ef0dfb11998dbba60683ad25 (diff) | |
parent | 42ed94cb6f02f8b9883ca03160e869a84903e3db (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/metag/include/asm/pgalloc.h')
-rw-r--r-- | arch/metag/include/asm/pgalloc.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/metag/include/asm/pgalloc.h b/arch/metag/include/asm/pgalloc.h index 275d9285141c..3104df0a4822 100644 --- a/arch/metag/include/asm/pgalloc.h +++ b/arch/metag/include/asm/pgalloc.h @@ -52,8 +52,12 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, { struct page *pte; pte = alloc_pages(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO, 0); - if (pte) - pgtable_page_ctor(pte); + if (!pte) + return NULL; + if (!pgtable_page_ctor(pte)) { + __free_page(pte); + return NULL; + } return pte; } |