From 4bacb2c06ad777ea565fa3916483e53f86fb9733 Mon Sep 17 00:00:00 2001
From: Henrik Kretzschmar <henne@nachtwindheim.de>
Date: Wed, 4 Oct 2006 02:15:22 -0700
Subject: [PATCH] --- yaml --- r: 38340 b: refs/heads/master c:
 b2abacf3a2699a8020829c85c16f358ba85cecaf h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/mm/filemap.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 706101dea668..358bb110769e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e95be9a5326f0f6d314a7aa04a3c0c0e67fa976b
+refs/heads/master: b2abacf3a2699a8020829c85c16f358ba85cecaf
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index ec469235985d..f789500406fe 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -1139,11 +1139,11 @@ int file_read_actor(read_descriptor_t *desc, struct page *page,
 }
 
 /**
- * __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.