Skip to content

Commit

Permalink
[PATCH] ppc64: add memory present
Browse files Browse the repository at this point in the history
Provide hooks for PPC64 to allow memory models to be informed of installed
memory areas.  This allows SPARSEMEM to instantiate mem_map for the populated
areas.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Martin Bligh <mbligh@aracnet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Andy Whitcroft authored and Linus Torvalds committed Jun 23, 2005
1 parent 510f8fa commit 74b30be
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/ppc64/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ config ARCH_FLATMEM_ENABLE
source "mm/Kconfig"

config HAVE_ARCH_EARLY_PFN_TO_NID
bool
default y
def_bool y
depends on NEED_MULTIPLE_NODES

# Some NUMA nodes have memory ranges that span
# other nodes. Even though a pfn is valid and
Expand Down
3 changes: 3 additions & 0 deletions arch/ppc64/mm/numa.c
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,8 @@ static int __init parse_numa_properties(void)
for (i = start ; i < (start+size); i += MEMORY_INCREMENT)
numa_memory_lookup_table[i >> MEMORY_INCREMENT_SHIFT] =
numa_domain;
memory_present(numa_domain, start >> PAGE_SHIFT,
(start + size) >> PAGE_SHIFT);

if (--ranges)
goto new_range;
Expand Down Expand Up @@ -481,6 +483,7 @@ static void __init setup_nonnuma(void)

for (i = 0 ; i < top_of_ram; i += MEMORY_INCREMENT)
numa_memory_lookup_table[i >> MEMORY_INCREMENT_SHIFT] = 0;
memory_present(0, 0, init_node_data[0].node_end_pfn);
}

static void __init dump_numa_topology(void)
Expand Down

0 comments on commit 74b30be

Please sign in to comment.