diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-16 22:06:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-16 22:06:35 +0000 |
| commit | c293f79246d7cdaf6e75b40aa1f957eb8d195835 (patch) | |
| tree | 2559c41e0baa8e0f160ce033e1b4c245d0ce0dcf /mm/memory.c | |
| parent | 2156eda2aafa0b0f660656246a11d7c2a9947ff9 (diff) | |
| parent | 5054319d9fe56ed1ef6c83c00ae37fdc2b277a79 (diff) | |
Merge tag 'v3.10.65' into linux-linaro-lsk
This is the 3.10.65 stable release
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c index 8a305c0c5699..1df7bd48cdae 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3202,7 +3202,7 @@ static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned lo if (prev && prev->vm_end == address) return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM; - expand_downwards(vma, address - PAGE_SIZE); + return expand_downwards(vma, address - PAGE_SIZE); } if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) { struct vm_area_struct *next = vma->vm_next; @@ -3211,7 +3211,7 @@ static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned lo if (next && next->vm_start == address + PAGE_SIZE) return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM; - expand_upwards(vma, address + PAGE_SIZE); + return expand_upwards(vma, address + PAGE_SIZE); } return 0; } |