summaryrefslogtreecommitdiffstats
path: root/mm/swap.c
diff options
context:
space:
mode:
authorMike Rapoport <rppt@linux.vnet.ibm.com>2018-02-21 14:45:50 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-02-21 15:35:43 -0800
commitcb6f0f34802dd7148d930f4f8d1cce991b8c23be (patch)
treed1c5f66a4601ff1e5c4a914a49a987842a0a051b /mm/swap.c
parent14fec9eba43b05d39825128e4354a2dc50fb59ea (diff)
downloadlinux-stable-cb6f0f34802dd7148d930f4f8d1cce991b8c23be.tar.gz
linux-stable-cb6f0f34802dd7148d930f4f8d1cce991b8c23be.tar.bz2
linux-stable-cb6f0f34802dd7148d930f4f8d1cce991b8c23be.zip
mm/swap.c: make functions and their kernel-doc agree (again)
There was a conflict between the commit e02a9f048ef7 ("mm/swap.c: make functions and their kernel-doc agree") and the commit f144c390f905 ("mm: docs: fix parameter names mismatch") that both tried to fix mismatch betweeen pagevec_lookup_entries() parameter names and their description. Since nr_entries is a better name for the parameter, fix the description again. Link: http://lkml.kernel.org/r/1518116946-20947-1-git-send-email-rppt@linux.vnet.ibm.com Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Acked-by: Randy Dunlap <rdunlap@infradead.org> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Cc: Matthew Wilcox <willy@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/swap.c')
-rw-r--r--mm/swap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/swap.c b/mm/swap.c
index 2d337710218f..0f17330dd0e5 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -925,7 +925,7 @@ EXPORT_SYMBOL(__pagevec_lru_add);
* @pvec: Where the resulting entries are placed
* @mapping: The address_space to search
* @start: The starting entry index
- * @nr_pages: The maximum number of pages
+ * @nr_entries: The maximum number of pages
* @indices: The cache indices corresponding to the entries in @pvec
*
* pagevec_lookup_entries() will search for and return a group of up