Merge branch 'akpm' (patches from Andrew)
[muen/linux.git] / mm / memory.c
index bc381486d527eca96cbb8676cd976f1efdddd613..7206a634270be3641e2255aa4c9d9eee68daed51 100644 (file)
@@ -1656,16 +1656,15 @@ static void zap_page_range_single(struct vm_area_struct *vma, unsigned long addr
  *
  * The entire address range must be fully contained within the vma.
  *
- * Returns 0 if successful.
  */
-int zap_vma_ptes(struct vm_area_struct *vma, unsigned long address,
+void zap_vma_ptes(struct vm_area_struct *vma, unsigned long address,
                unsigned long size)
 {
        if (address < vma->vm_start || address + size > vma->vm_end ||
                        !(vma->vm_flags & VM_PFNMAP))
-               return -1;
+               return;
+
        zap_page_range_single(vma, address, size, NULL);
-       return 0;
 }
 EXPORT_SYMBOL_GPL(zap_vma_ptes);