vserver 2.0 rc7

[linux-2.6.git] / mm / mincore.c

diff --git a/mm/mincore.c b/mm/mincore.c
index c47fff5..7289078 100644 (file)
--- a/mm/mincore.c
+++ b/mm/mincore.c
@@ -97,8 +97,7 @@ static long mincore_vma(struct vm_area_struct * vma,
  * return values:
  *  zero    - success
  *  -EFAULT - vec points to an illegal address
- *  -EINVAL - addr is not a multiple of PAGE_CACHE_SIZE,
- *             or len has a nonpositive value
+ *  -EINVAL - addr is not a multiple of PAGE_CACHE_SIZE
  *  -ENOMEM - Addresses in the range [addr, addr + len] are
  *             invalid for the address space of this process, or
  *             specify one or more pages which are not currently
@@ -119,17 +118,17 @@ asmlinkage long sys_mincore(unsigned long start, size_t len,
        if (start & ~PAGE_CACHE_MASK)
                goto einval;
 
-       if (start < FIRST_USER_PGD_NR * PGDIR_SIZE)
-               goto enomem;
-
        limit = TASK_SIZE;
        if (start >= limit)
                goto enomem;
 
+       if (!len)
+               return 0;
+
        max = limit - start;
        len = PAGE_CACHE_ALIGN(len);
-       if (len > max)
-               goto einval;
+       if (len > max || !len)
+               goto enomem;
 
        end = start + len;