linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Philipp Hachtmann <phacht@linux.vnet.ibm.com>
To: akpm@linux-foundation.org
Cc: hannes@cmpxchg.org, liuj97@gmail.com, santosh.shilimkar@ti.com,
	grygorii.strashko@ti.com, iamjoonsoo.kim@lge.com,
	robin.m.holt@gmail.com, tangchen@cn.fujitsu.com,
	yinghai@kernel.org, linux-mm@kvack.org,
	linux-kernel@vger.kernel.org,
	Philipp Hachtmann <phacht@linux.vnet.ibm.com>
Subject: [PATCH V5 1/3] mm/nobootmem: Fix unused variable
Date: Mon, 20 Jan 2014 12:32:37 +0100	[thread overview]
Message-ID: <1390217559-14691-2-git-send-email-phacht@linux.vnet.ibm.com> (raw)
In-Reply-To: <1390217559-14691-1-git-send-email-phacht@linux.vnet.ibm.com>

This fixes an unused variable warning in nobootmem.c

Signed-off-by: Philipp Hachtmann <phacht@linux.vnet.ibm.com>
---
 mm/nobootmem.c | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/mm/nobootmem.c b/mm/nobootmem.c
index e2906a5..0215c77 100644
--- a/mm/nobootmem.c
+++ b/mm/nobootmem.c
@@ -116,23 +116,29 @@ static unsigned long __init __free_memory_core(phys_addr_t start,
 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);
 
 #ifdef CONFIG_ARCH_DISCARD_MEMBLOCK
-
-	/* Free memblock.reserved array if it was allocated */
-	size = get_allocated_memblock_reserved_regions_info(&start);
-	if (size)
-		count += __free_memory_core(start, start + size);
-
-	/* Free memblock.memory array if it was allocated */
-	size = get_allocated_memblock_memory_regions_info(&start);
-	if (size)
-		count += __free_memory_core(start, start + size);
+	{
+		phys_addr_t size;
+		/* Free memblock.reserved array if it was allocated */
+		size = get_allocated_memblock_reserved_regions_info(&start);
+		if (size)
+			count += __free_memory_core(start, start + size);
+		
+		/* Free memblock.memory array if it was allocated */
+		size = get_allocated_memblock_memory_regions_info(&start);
+		if (size)
+			count += __free_memory_core(start, start + size);
+	}
 #endif
 
 	return count;
-- 
1.8.4.5

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  reply	other threads:[~2014-01-20 11:33 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-20 11:32 [PATCH V5 0/3] mm/memblock: Excluded memory Philipp Hachtmann
2014-01-20 11:32 ` Philipp Hachtmann [this message]
2014-01-20 16:28   ` [PATCH V5 1/3] mm/nobootmem: Fix unused variable Robin Holt
2014-01-21  6:16   ` David Rientjes
2014-01-21  6:57     ` Philipp Hachtmann
2014-01-21  9:51       ` David Rientjes
2014-01-20 11:32 ` [PATCH V5 2/3] mm/memblock: Add support for excluded memory areas Philipp Hachtmann
2014-01-22 11:18   ` Philipp Hachtmann
2014-01-22 20:41     ` Andrew Morton
2014-01-22 15:27   ` Robin Holt
2014-01-20 11:32 ` [PATCH V5 3/3] mm/memblock: Cleanup and refactoring after addition of nomap Philipp Hachtmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1390217559-14691-2-git-send-email-phacht@linux.vnet.ibm.com \
    --to=phacht@linux.vnet.ibm.com \
    --cc=akpm@linux-foundation.org \
    --cc=grygorii.strashko@ti.com \
    --cc=hannes@cmpxchg.org \
    --cc=iamjoonsoo.kim@lge.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=liuj97@gmail.com \
    --cc=robin.m.holt@gmail.com \
    --cc=santosh.shilimkar@ti.com \
    --cc=tangchen@cn.fujitsu.com \
    --cc=yinghai@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox