diff --git a/[refs] b/[refs] index 6129bf90425b..37205443e085 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6901e639800e745457b1dcd99c52647981438d7 +refs/heads/master: f0b85c0cfdad8977d82fed88e846fc2245585d0e diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c index 6cf700d41844..49a6fe375d01 100644 --- a/trunk/mm/filemap.c +++ b/trunk/mm/filemap.c @@ -843,7 +843,7 @@ static void shrink_readahead_size_eio(struct file *filp, /** * do_generic_mapping_read - generic file read routine * @mapping: address_space to be read - * @ra: file's readahead state + * @_ra: file's readahead state * @filp: the file to read * @ppos: current file position * @desc: read_descriptor