[parisc-linux] Re:[parisc-linux-cvs] linux-2.6.git: Changes to 'master'

[Joel Soete]

> On Wed, Dec 20, 2006 at 09:27:04AM +0100, Joel Soete wrote:
> > Hello *,
> > 
> > Any idea why git-pull didn't reach to merge those last 3 commit?
> 
> What error message are you getting?
> 
> 
no error (???)
[snip]
* refs/heads/linus: not updating to non-fast forward branch 'linus' of
http://www.parisc-linux.org/git/linux-2.6
  old...new: 0174cc9...f238085
# echo $?
0

but no message about file changes and checking:
e.g. mm/mmap.c:
[snip]
   1537         /*
   1538          * vma->vm_start/vm_end cannot change under us because the caller
   1539          * is required to hold the mmap_sem in read mode.  We need the
   1540          * anon_vma lock to serialize against concurrent expand_stacks.
   1541          */
   1542         address += 4 + PAGE_SIZE - 1;
   1543         address &= PAGE_MASK;
   1544         error = 0;
[snip]

which would have to be changed by this patch:
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1538,9 +1538,14 @@ int expand_upwards(struct vm_area_struct *vma, unsigned
long address)
         * vma->vm_start/vm_end cannot change under us because the caller
         * is required to hold the mmap_sem in read mode.  We need the
         * anon_vma lock to serialize against concurrent expand_stacks.
+        * Also guard against wrapping around to address 0.
         */
-       address += 4 + PAGE_SIZE - 1;
-       address &= PAGE_MASK;
+       if (address < PAGE_ALIGN(address+4))
+               address = PAGE_ALIGN(address+4);
+       else {
+               anon_vma_unlock(vma);
+               return -ENOMEM;
+       }
        error = 0;
 
        /* Somebody else might have raced and expanded it already */
=== <> ===

fwiw the latest stuff merge in my local tree is:
<http://lists.parisc-linux.org/pipermail/parisc-linux-cvs/2006-December/037145.html>

(same author)

May be because I use http protocol (but I haven't any other choise at the office?)

Joel---
Scarlet One - Combinez l'ADSL avec la telephonie fixe illimitee et epargnez 400 euros
http://www.scarlet.be