aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/include
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>2013-11-14 14:31:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 09:32:16 +0900
commit3fd681b68cd34eacb106b25fcb10bb202a3232c5 (patch)
tree3c6ac2562a15c48a082353841012c665ae62ffd3 /arch/alpha/include
parentopenrisc: add missing pgtable_page_ctor/dtor calls (diff)
downloadlinux-dev-3fd681b68cd34eacb106b25fcb10bb202a3232c5.tar.xz
linux-dev-3fd681b68cd34eacb106b25fcb10bb202a3232c5.zip
alpha: handle pgtable_page_ctor() fail
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Matt Turner <mattst88@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/alpha/include')
-rw-r--r--arch/alpha/include/asm/pgalloc.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
index bc2a0daf2d92..aab14a019c20 100644
--- a/arch/alpha/include/asm/pgalloc.h
+++ b/arch/alpha/include/asm/pgalloc.h
@@ -72,7 +72,10 @@ pte_alloc_one(struct mm_struct *mm, unsigned long address)
if (!pte)
return NULL;
page = virt_to_page(pte);
- pgtable_page_ctor(page);
+ if (!pgtable_page_ctor(page)) {
+ __free_page(page);
+ return NULL;
+ }
return page;
}