Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 1c1271850494f06b63ae6b485e2e1b9c27ffb2d1

Authored by Denys Vlasenko
Committed by Linus Torvalds
1 parent 08c1184fa2
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

parisc: fix find_extend_vma() breakage 

The STACK_GROWSUP case of stack expansion was missing a test for 'prev',
which got removed by commit cb8f488c33539f096580e202f5438a809195008f
("mmap.c: deinline a few functions") by mistake.

I found my original email in "sent" folder. The patch in that mail
does NOT remove !prev. That change had beed added by someone else.

Ok, I think we are not much interested in who did it, let's
fix it for good.

[ "It looks like this was caused by me fixing rejects.  That was the
  fancy include-lots-of-context-so-it-wont-apply patch." - akpm ]

Reported-and-bisected-by: Helge Deller <deller@gmx.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

... ... @@ -1704,7 +1704,7 @@
1704 1704 vma = find_vma_prev(mm, addr, &prev);
1705 1705 if (vma && (vma->vm_start <= addr))
1706 1706 return vma;
1707   - if (expand_stack(prev, addr))
  1707 + if (!prev || expand_stack(prev, addr))
1708 1708 return NULL;
1709 1709 if (prev->vm_flags & VM_LOCKED) {
1710 1710 if (mlock_vma_pages_range(prev, addr, prev->vm_end) < 0)