public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andy Whitcroft <apw@shadowen.org>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] x86_64 sparsemem does not need node_mem_map
Date: Tue, 11 Apr 2006 13:08:29 +0100	[thread overview]
Message-ID: <20060411120829.GA1394@shadowen.org> (raw)
In-Reply-To: 20060408031405.5e5131da.akpm@osdl.org

x86_64 sparsemem does not need node_mem_map

Seems we are trying to init the node_mem_map when we don't need to,
for example when SPARSEMEM is enabled.  This causes the error below
during compilation.  Use CONFIG_FLAT_NODE_MEM_MAP to gate allocation
and init.

  arch/x86_64/mm/numa.c: In function `setup_node_zones':
  arch/x86_64/mm/numa.c:191: error: structure has no member
                                                  named `node_mem_map'

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
---
 numa.c |    2 ++
 1 files changed, 2 insertions(+)
diff -upN reference/arch/x86_64/mm/numa.c current/arch/x86_64/mm/numa.c
--- reference/arch/x86_64/mm/numa.c
+++ current/arch/x86_64/mm/numa.c
@@ -188,11 +188,13 @@ void __init setup_node_zones(int nodeid)
 	   memory. */
 	memmapsize = sizeof(struct page) * (end_pfn-start_pfn);
 	limit = end_pfn << PAGE_SHIFT;
+#ifdef CONFIG_FLAT_NODE_MEM_MAP
 	NODE_DATA(nodeid)->node_mem_map = 
 		__alloc_bootmem_core(NODE_DATA(nodeid)->bdata, 
 				memmapsize, SMP_CACHE_BYTES, 
 				round_down(limit - memmapsize, PAGE_SIZE), 
 				limit);
+#endif
 
 	size_zones(zones, holes, start_pfn, end_pfn);
 	free_area_init_node(nodeid, NODE_DATA(nodeid), zones,

      parent reply	other threads:[~2006-04-11 12:08 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-04-08 10:14 2.6.17-rc1-mm2 Andrew Morton
2006-04-09 11:31 ` [-mm patch] drivers/w1/w1.c: fix a compile error Adrian Bunk
2006-04-09 11:39   ` Evgeniy Polyakov
2006-04-09 14:50 ` [-mm patch] drivers/pci/hotplug/acpiphp_glue.c: make a function static Adrian Bunk
2006-04-10  0:27   ` MUNEDA Takahiro
2006-04-09 14:58 ` [-mm patch] drivers/char/drm/drm_memory.c: possible cleanups Adrian Bunk
2006-04-11 12:08 ` Andy Whitcroft [this message]

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=20060411120829.GA1394@shadowen.org \
    --to=apw@shadowen.org \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.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