Title: [6698] trunk/fs/nfs/file.c: drop our local nommu change to the nfs mmap as upstream has addressed this in a different (nicer) way
- Revision
- 6698
- Author
- vapier
- Date
- 2009-06-13 06:15:10 -0500 (Sat, 13 Jun 2009)
Log Message
drop our local nommu change to the nfs mmap as upstream has addressed this in a different (nicer) way
Modified Paths
Diff
Modified: trunk/fs/nfs/file.c (6697 => 6698)
--- trunk/fs/nfs/file.c 2009-06-13 10:45:12 UTC (rev 6697)
+++ trunk/fs/nfs/file.c 2009-06-13 11:15:10 UTC (rev 6698)
@@ -284,7 +284,6 @@
return res;
}
-#ifdef CONFIG_MMU
static int
nfs_file_mmap(struct file * file, struct vm_area_struct * vma)
{
@@ -305,18 +304,7 @@
}
return status;
}
-#else
-static int
-nfs_file_mmap(struct file *file, struct vm_area_struct *vma)
-{
- /* Kill warning: 'nfs_file_vm_ops' defined but not used */
- struct vm_operations_struct *vm_ops;
- vm_ops = &nfs_file_vm_ops;
- return generic_file_mmap(file, vma);
-}
-#endif
-
/*
* Flush any dirty pages for this process, and check for write errors.
* The return status from this call provides a reliable indication of
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
