diff options
author | Yasunori Goto <y-goto@jp.fujitsu.com> | 2006-06-27 05:53:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-27 20:32:37 -0400 |
commit | 7049027c6f0098eb6b23b8f6ca65a905541faf81 (patch) | |
tree | ab5528625be6e79c02767c6d9444599c1980cf0e /include | |
parent | ae5a2c1c9b2bc3633032f97d02e60ae547a6047c (diff) |
[PATCH] pgdat allocation and update for ia64 of memory hotplug: update pgdat address array
This is to refresh node_data[] array for ia64. As I mentioned previous
patches, ia64 has copies of information of pgdat address array on each node as
per node data.
At v2 of node_add, this function used stop_machine_run() to update them. (I
wished that they were copied safety as much as possible.) But, in this patch,
this arrays are just copied simply, and set node_online_map bit after
completion of pgdat initialization.
So, kernel must touch NODE_DATA() macro after checking node_online_map().
(Current code has already done it.) This is more simple way for just
hot-add.....
Note : It will be problem when hot-remove will occur,
because, even if online_map bit is set, kernel may
touch NODE_DATA() due to race condition. :-(
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-ia64/nodedata.h | 12 | ||||
-rw-r--r-- | include/linux/memory_hotplug.h | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/include/asm-ia64/nodedata.h b/include/asm-ia64/nodedata.h index a140310bf84d..2fb337b0e9b7 100644 --- a/include/asm-ia64/nodedata.h +++ b/include/asm-ia64/nodedata.h | |||
@@ -46,6 +46,18 @@ struct ia64_node_data { | |||
46 | */ | 46 | */ |
47 | #define NODE_DATA(nid) (local_node_data->pg_data_ptrs[nid]) | 47 | #define NODE_DATA(nid) (local_node_data->pg_data_ptrs[nid]) |
48 | 48 | ||
49 | /* | ||
50 | * LOCAL_DATA_ADDR - This is to calculate the address of other node's | ||
51 | * "local_node_data" at hot-plug phase. The local_node_data | ||
52 | * is pointed by per_cpu_page. Kernel usually use it for | ||
53 | * just executing cpu. However, when new node is hot-added, | ||
54 | * the addresses of local data for other nodes are necessary | ||
55 | * to update all of them. | ||
56 | */ | ||
57 | #define LOCAL_DATA_ADDR(pgdat) \ | ||
58 | ((struct ia64_node_data *)((u64)(pgdat) + \ | ||
59 | L1_CACHE_ALIGN(sizeof(struct pglist_data)))) | ||
60 | |||
49 | #endif /* CONFIG_NUMA */ | 61 | #endif /* CONFIG_NUMA */ |
50 | 62 | ||
51 | #endif /* _ASM_IA64_NODEDATA_H */ | 63 | #endif /* _ASM_IA64_NODEDATA_H */ |
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 569b1f6c27d1..9b6260007e5e 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h | |||
@@ -91,9 +91,7 @@ static inline pg_data_t *arch_alloc_nodedata(int nid) | |||
91 | static inline void arch_free_nodedata(pg_data_t *pgdat) | 91 | static inline void arch_free_nodedata(pg_data_t *pgdat) |
92 | { | 92 | { |
93 | } | 93 | } |
94 | static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat) | 94 | extern void arch_refresh_nodedata(int nid, pg_data_t *pgdat); |
95 | { | ||
96 | } | ||
97 | 95 | ||
98 | #else /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ | 96 | #else /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ |
99 | 97 | ||