* [merged] mm-memblock-fix-ordering-of-flags-argument-in-comments.patch removed from -mm tree
@ 2016-01-19 20:00 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2016-01-19 20:00 UTC (permalink / raw)
To: f.fainelli, mm-commits
The patch titled
Subject: include/linux/memblock.h: fix ordering of 'flags' argument in comments
has been removed from the -mm tree. Its filename was
mm-memblock-fix-ordering-of-flags-argument-in-comments.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Florian Fainelli <f.fainelli@gmail.com>
Subject: 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>
---
include/linux/memblock.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN include/linux/memblock.h~mm-memblock-fix-ordering-of-flags-argument-in-comments include/linux/memblock.h
--- a/include/linux/memblock.h~mm-memblock-fix-ordering-of-flags-argument-in-comments
+++ a/include/linux/memblock.h
@@ -216,10 +216,10 @@ void __next_mem_pfn_range(int *idx, int
* for_each_free_mem_range - iterate through free memblock areas
* @i: u64 used as loop variable
* @nid: node selector, %NUMA_NO_NODE for all nodes
+ * @flags: pick from blocks based on memory attributes
* @p_start: ptr to phys_addr_t for start address of the range, can be %NULL
* @p_end: ptr to phys_addr_t for end address of the range, can be %NULL
* @p_nid: ptr to int for nid of the range, can be %NULL
- * @flags: pick from blocks based on memory attributes
*
* Walks over free (memory && !reserved) areas of memblock. Available as
* soon as memblock is initialized.
@@ -232,10 +232,10 @@ void __next_mem_pfn_range(int *idx, int
* for_each_free_mem_range_reverse - rev-iterate through free memblock areas
* @i: u64 used as loop variable
* @nid: node selector, %NUMA_NO_NODE for all nodes
+ * @flags: pick from blocks based on memory attributes
* @p_start: ptr to phys_addr_t for start address of the range, can be %NULL
* @p_end: ptr to phys_addr_t for end address of the range, can be %NULL
* @p_nid: ptr to int for nid of the range, can be %NULL
- * @flags: pick from blocks based on memory attributes
*
* Walks over free (memory && !reserved) areas of memblock in reverse
* order. Available as soon as memblock is initialized.
_
Patches currently in -mm which might be from f.fainelli@gmail.com are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-01-19 20:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-19 20:00 [merged] mm-memblock-fix-ordering-of-flags-argument-in-comments.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.