summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>2013-11-14 14:31:29 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 09:32:17 +0900
commit0da5303bdb55e67963e8b53ebf3a2aa75051cab4 (patch)
tree103a346256913e9012bd2e0d7c8000fe84c00799 /arch/cris
parent2cb6182bb6153f685c37773687e63094317b1eeb (diff)
downloadlinux-stable-0da5303bdb55e67963e8b53ebf3a2aa75051cab4.tar.gz
linux-stable-0da5303bdb55e67963e8b53ebf3a2aa75051cab4.tar.bz2
linux-stable-0da5303bdb55e67963e8b53ebf3a2aa75051cab4.zip
cris: handle pgtable_page_ctor() fail
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Mikael Starvik <starvik@axis.com> Acked-by: Jesper Nilsson <jesper.nilsson@axis.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/include/asm/pgalloc.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/cris/include/asm/pgalloc.h b/arch/cris/include/asm/pgalloc.h
index d9504d38c276..235ece437ddd 100644
--- a/arch/cris/include/asm/pgalloc.h
+++ b/arch/cris/include/asm/pgalloc.h
@@ -34,7 +34,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addres
pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0);
if (!pte)
return NULL;
- pgtable_page_ctor(pte);
+ if (!pgtable_page_ctor(pte)) {
+ __free_page(pte);
+ return NULL;
+ }
return pte;
}