Pull ibm into test branch

[linux-2.6] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index fef7d879ddf5f2cb30eae36ee7e7a74fc1cc806f..3464b681f8449eda37ee74b9581ad03266f6e619 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1139,11 +1139,11 @@ success:
 }
 
 /**
- * __generic_file_aio_read - generic filesystem read routine
+ * generic_file_aio_read - generic filesystem read routine
  * @iocb:      kernel I/O control block
  * @iov:       io vector request
  * @nr_segs:   number of segments in the iovec
- * @ppos:      current file position
+ * @pos:       current file position
  *
  * This is the "read()" routine for all filesystems
  * that can use the page cache directly.