diff options
author | Yasunori Goto <y-goto@jp.fujitsu.com> | 2007-05-08 03:23:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:14:57 -0400 |
commit | a3142c8e1dd57ff48040bdb3478cff9312543dc3 (patch) | |
tree | 14beeb03421338b917a956e9269a2ce95e0f62cf /arch/ia64 | |
parent | 0ceb331433e8aad9c5f441a965d7c681f8b9046f (diff) |
Fix section mismatch of memory hotplug related code.
This is to fix many section mismatches of code related to memory hotplug.
I checked compile with memory hotplug on/off on ia64 and x86-64 box.
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/mm/discontig.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index 872da7a2accd..94844442812a 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c | |||
@@ -693,6 +693,7 @@ void __init paging_init(void) | |||
693 | zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page)); | 693 | zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page)); |
694 | } | 694 | } |
695 | 695 | ||
696 | #ifdef CONFIG_MEMORY_HOTPLUG | ||
696 | pg_data_t *arch_alloc_nodedata(int nid) | 697 | pg_data_t *arch_alloc_nodedata(int nid) |
697 | { | 698 | { |
698 | unsigned long size = compute_pernodesize(nid); | 699 | unsigned long size = compute_pernodesize(nid); |
@@ -710,3 +711,4 @@ void arch_refresh_nodedata(int update_node, pg_data_t *update_pgdat) | |||
710 | pgdat_list[update_node] = update_pgdat; | 711 | pgdat_list[update_node] = update_pgdat; |
711 | scatter_node_data(); | 712 | scatter_node_data(); |
712 | } | 713 | } |
714 | #endif | ||