diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2013-11-14 17:31:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 19:32:18 -0500 |
commit | 4f804943f99454ac79e0f448428447f1a72d09fc (patch) | |
tree | daf81d67eeb5736b3bb227d948132306eafcb3d9 | |
parent | bc16640dce9035177c99d8fb11d3b94abe9f36c8 (diff) |
powerpc: handle pgtable_page_ctor() fail
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/powerpc/include/asm/pgalloc-64.h | 5 | ||||
-rw-r--r-- | arch/powerpc/mm/pgtable_32.c | 5 | ||||
-rw-r--r-- | arch/powerpc/mm/pgtable_64.c | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h index f65e27b09bd3..16cb92d215d2 100644 --- a/arch/powerpc/include/asm/pgalloc-64.h +++ b/arch/powerpc/include/asm/pgalloc-64.h | |||
@@ -91,7 +91,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, | |||
91 | if (!pte) | 91 | if (!pte) |
92 | return NULL; | 92 | return NULL; |
93 | page = virt_to_page(pte); | 93 | page = virt_to_page(pte); |
94 | pgtable_page_ctor(page); | 94 | if (!pgtable_page_ctor(page)) { |
95 | __free_page(page); | ||
96 | return NULL; | ||
97 | } | ||
95 | return page; | 98 | return page; |
96 | } | 99 | } |
97 | 100 | ||
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index 6c856fb8c15b..5b9601715289 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c | |||
@@ -121,7 +121,10 @@ pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) | |||
121 | ptepage = alloc_pages(flags, 0); | 121 | ptepage = alloc_pages(flags, 0); |
122 | if (!ptepage) | 122 | if (!ptepage) |
123 | return NULL; | 123 | return NULL; |
124 | pgtable_page_ctor(ptepage); | 124 | if (!pgtable_page_ctor(ptepage)) { |
125 | __free_page(ptepage); | ||
126 | return NULL; | ||
127 | } | ||
125 | return ptepage; | 128 | return ptepage; |
126 | } | 129 | } |
127 | 130 | ||
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c index 536eec72c0f7..9d95786aa80f 100644 --- a/arch/powerpc/mm/pgtable_64.c +++ b/arch/powerpc/mm/pgtable_64.c | |||
@@ -378,6 +378,10 @@ static pte_t *__alloc_for_cache(struct mm_struct *mm, int kernel) | |||
378 | __GFP_REPEAT | __GFP_ZERO); | 378 | __GFP_REPEAT | __GFP_ZERO); |
379 | if (!page) | 379 | if (!page) |
380 | return NULL; | 380 | return NULL; |
381 | if (!kernel && !pgtable_page_ctor(page)) { | ||
382 | __free_page(page); | ||
383 | return NULL; | ||
384 | } | ||
381 | 385 | ||
382 | ret = page_address(page); | 386 | ret = page_address(page); |
383 | spin_lock(&mm->page_table_lock); | 387 | spin_lock(&mm->page_table_lock); |
@@ -392,9 +396,6 @@ static pte_t *__alloc_for_cache(struct mm_struct *mm, int kernel) | |||
392 | } | 396 | } |
393 | spin_unlock(&mm->page_table_lock); | 397 | spin_unlock(&mm->page_table_lock); |
394 | 398 | ||
395 | if (!kernel) | ||
396 | pgtable_page_ctor(page); | ||
397 | |||
398 | return (pte_t *)ret; | 399 | return (pte_t *)ret; |
399 | } | 400 | } |
400 | 401 | ||