Subject: + mm-nobootmem-free_all_bootmem-again-fix.patch added to -mm tree
To: phacht@xxxxxxxxxxxxxxxxxx,rientjes@xxxxxxxxxx,robinmholt@xxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 17 Jan 2014 13:38:47 -0800
The patch titled
Subject: mm-nobootmem-free_all_bootmem-again-fix
has been added to the -mm tree. Its filename is
mm-nobootmem-free_all_bootmem-again-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-nobootmem-free_all_bootmem-again-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-nobootmem-free_all_bootmem-again-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Philipp Hachtmann <phacht@xxxxxxxxxxxxxxxxxx>
Subject: mm-nobootmem-free_all_bootmem-again-fix
This fixes an unused variable warning in nobootmem.c
Signed-off-by: Philipp Hachtmann <phacht@xxxxxxxxxxxxxxxxxx>
Cc: Robin Holt <robinmholt@xxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/nobootmem.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff -puN mm/nobootmem.c~mm-nobootmem-free_all_bootmem-again-fix mm/nobootmem.c
--- a/mm/nobootmem.c~mm-nobootmem-free_all_bootmem-again-fix
+++ a/mm/nobootmem.c
@@ -116,9 +116,13 @@ static unsigned long __init __free_memor
static unsigned long __init free_low_memory_core_early(void)
{
unsigned long count = 0;
- phys_addr_t start, end, size;
+ phys_addr_t start, end;
u64 i;
+#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK
+ phys_addr_t size;
+#endif
+
for_each_free_mem_range(i, NUMA_NO_NODE, &start, &end, NULL)
count += __free_memory_core(start, end);
_
Patches currently in -mm which might be from phacht@xxxxxxxxxxxxxxxxxx are
mm-nobootmemc-add-return-value-check-in-__alloc_memory_core_early.patch
mm-free-memblockmemory-in-free_all_bootmem.patch
mm-free-memblockmemory-in-free_all_bootmem-fix.patch
mm-nobootmem-free_all_bootmem-again.patch
mm-nobootmem-free_all_bootmem-again-fix.patch
mm-nobootmem-free_all_bootmem-again-fix-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
