Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6

into kernel.bkbits.net:/home/davem/net-2.6

mm/filemap.c

@@ -1421,16 +1421,10 @@ static int filemap_populate(struct vm_area_struct *vma,
 			return err;
 		}
 	} else {
-	    	/*
-		 * If a nonlinear mapping then store the file page offset
-		 * in the pte.
-		 */
-		if (pgoff != linear_page_index(vma, addr)) {
 		err = install_file_pte(mm, vma, addr, pgoff, prot);
 		if (err)
 			return err;
 	}
-	}
 
 	len -= PAGE_SIZE;
 	addr += PAGE_SIZE;

mm/shmem.c

@@ -1121,16 +1121,10 @@ static int shmem_populate(struct vm_area_struct *vma,
 				return err;
 			}
 		} else if (nonblock) {
-	    		/*
-		 	 * If a nonlinear mapping then store the file page
-			 * offset in the pte.
-			 */
-			if (pgoff != linear_page_index(vma, addr)) {
     			err = install_file_pte(mm, vma, addr, pgoff, prot);
 			if (err)
 	    			return err;
 		}
-		}
 
 		len -= PAGE_SIZE;
 		addr += PAGE_SIZE;