diff options
| author |   Yasunori Goto <y-goto@jp.fujitsu.com> | 2006-06-27 02:53:30 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-27 17:32:35 -0700 |
| commit | bc02af93dd2bbddce1b55e0a493f833a1b7cf140 (patch) | |
| tree | bda7998531b9c612c5597be9158f082d1cb5ab26 /arch/i386/mm | |
| parent | [PATCH] Catch notification of memory add event of ACPI via container driver. (avoid redundant call add_memory) (diff) | |
| download | linux-dev-bc02af93dd2bbddce1b55e0a493f833a1b7cf140.tar.xz linux-dev-bc02af93dd2bbddce1b55e0a493f833a1b7cf140.zip | |
[PATCH] pgdat allocation for new node add (specify node id)
Change the name of old add_memory() to arch_add_memory. And use node id to
get pgdat for the node at NODE_DATA().
Note: Powerpc's old add_memory() is defined as __devinit. However,
add_memory() is usually called only after bootup.
I suppose it may be redundant. But, I'm not well known about powerpc.
So, I keep it. (But, __meminit is better at least.)
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/mm')
| -rw-r--r-- | arch/i386/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c index bf19513f0cea..468592531793 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c @@ -654,7 +654,7 @@ void __init mem_init(void) */ #ifdef CONFIG_MEMORY_HOTPLUG #ifndef CONFIG_NEED_MULTIPLE_NODES -int add_memory(u64 start, u64 size) +int arch_add_memory(int nid, u64 start, u64 size) { struct pglist_data *pgdata = &contig_page_data; struct zone *zone = pgdata->node_zones + MAX_NR_ZONES-1; |