aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/memblock.h
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2016-01-14 18:22:04 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-14 19:00:49 -0500
commitd30b5545bdcf802ffc24ec7dbc6dc4036f6e3820 (patch)
tree482c967398d89218f2ce5b7cde79d01ea89ad5d9 /include/linux/memblock.h
parentd72ee911130631b50a8ccc615a7d4622c2062194 (diff)
include/linux/memblock.h: fix ordering of 'flags' argument in comments
for_each_free_mem_range() and for_each_free_mem_range_reverse() both accept a 'flags' argument, the comment surrounding the macro placed the 'flags' documentation at the very end, while 'flags' is in fact the 3rd argument to the macro, so let's preserve natural ordering here. Fixes: fc6daaf931518 ("mm/memblock: add extra "flags" to memblock to allow selection of memory based on attribute") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/memblock.h')
-rw-r--r--include/linux/memblock.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index c0c4208a286f..173fb44e22f1 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -216,10 +216,10 @@ void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn,
216 * for_each_free_mem_range - iterate through free memblock areas 216 * for_each_free_mem_range - iterate through free memblock areas
217 * @i: u64 used as loop variable 217 * @i: u64 used as loop variable
218 * @nid: node selector, %NUMA_NO_NODE for all nodes 218 * @nid: node selector, %NUMA_NO_NODE for all nodes
219 * @flags: pick from blocks based on memory attributes
219 * @p_start: ptr to phys_addr_t for start address of the range, can be %NULL 220 * @p_start: ptr to phys_addr_t for start address of the range, can be %NULL
220 * @p_end: ptr to phys_addr_t for end address of the range, can be %NULL 221 * @p_end: ptr to phys_addr_t for end address of the range, can be %NULL
221 * @p_nid: ptr to int for nid of the range, can be %NULL 222 * @p_nid: ptr to int for nid of the range, can be %NULL
222 * @flags: pick from blocks based on memory attributes
223 * 223 *
224 * Walks over free (memory && !reserved) areas of memblock. Available as 224 * Walks over free (memory && !reserved) areas of memblock. Available as
225 * soon as memblock is initialized. 225 * soon as memblock is initialized.
@@ -232,10 +232,10 @@ void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn,
232 * for_each_free_mem_range_reverse - rev-iterate through free memblock areas 232 * for_each_free_mem_range_reverse - rev-iterate through free memblock areas
233 * @i: u64 used as loop variable 233 * @i: u64 used as loop variable
234 * @nid: node selector, %NUMA_NO_NODE for all nodes 234 * @nid: node selector, %NUMA_NO_NODE for all nodes
235 * @flags: pick from blocks based on memory attributes
235 * @p_start: ptr to phys_addr_t for start address of the range, can be %NULL 236 * @p_start: ptr to phys_addr_t for start address of the range, can be %NULL
236 * @p_end: ptr to phys_addr_t for end address of the range, can be %NULL 237 * @p_end: ptr to phys_addr_t for end address of the range, can be %NULL
237 * @p_nid: ptr to int for nid of the range, can be %NULL 238 * @p_nid: ptr to int for nid of the range, can be %NULL
238 * @flags: pick from blocks based on memory attributes
239 * 239 *
240 * Walks over free (memory && !reserved) areas of memblock in reverse 240 * Walks over free (memory && !reserved) areas of memblock in reverse
241 * order. Available as soon as memblock is initialized. 241 * order. Available as soon as memblock is initialized.