Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a4c28ab7445f5ca60e56ffd90edb3e9fc1330b71

Authored by Akinobu Mita
Committed by Paul Mackerras
1 parent 66b30922c8
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[POWERPC] Fix return from pte_alloc_one() in out-of-memory case 

pte_alloc_one() is expected to return NULL if out of memory.
But it returns virt_to_page(NULL), which is not NULL.
This fixes it.

Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Akinobu Mita <mita@fixstars.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

include/asm-powerpc/pgalloc-64.h
Diff comments   View file @ a4c28ab
... ... @@ -90,7 +90,8 @@
90 90 static inline struct page *pte_alloc_one(struct mm_struct *mm,
91 91 unsigned long address)
92 92 {
93   - return virt_to_page(pte_alloc_one_kernel(mm, address));
  93 + pte_t *pte = pte_alloc_one_kernel(mm, address);
  94 + return pte ? virt_to_page(pte) : NULL;
94 95 }
95 96  
96 97 static inline void pte_free_kernel(pte_t *pte)