diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-10-30 18:01:51 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-10-30 18:01:51 +1100 |
commit | 34af32cdbaa2f94a4dde7a2e6175d85efc6a43f1 (patch) | |
tree | e9f1f0aa17e504431219f35417521f3477587a09 /arch/m68k/include/asm/sun3_pgalloc.h | |
parent | bb45894af6153af1ce65e7ed6588467e07daf193 (diff) | |
parent | 592e45d2af599ae3e696a7ae87d015a1304f42b5 (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/m68k/include/asm/sun3_pgalloc.h')
-rw-r--r-- | arch/m68k/include/asm/sun3_pgalloc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h index 48d80d5a666f..f868506e3350 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; } |