OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] pgdat allocation and update for ia64 of memory hotplug: allocate pgdat and per node data 

This is a patch to allocate pgdat and per node data area for ia64.  The size
for them can be calculated by compute_pernodesize().

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>
This commit is contained in:
Yasunori Goto 2006-06-27 02:53:40 -07:00 committed by Linus Torvalds
parent 7049027c6f
commit dd0932d9d4
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/ia64/mm/discontig.c
View File

@ -100,7 +100,7 @@ static int __init build_node_maps(unsigned long start, unsigned long len,
* acpi_boot_init() (which builds the node_to_cpu_mask array) hasn't been
* called yet. Note that node 0 will also count all non-existent cpus.
*/
static int __init early_nr_cpus_node(int node)
static int __meminit early_nr_cpus_node(int node)
{
int cpu, n = 0;
@ -115,7 +115,7 @@ static int __init early_nr_cpus_node(int node)
* compute_pernodesize - compute size of pernode data
* @node: the node id.
*/
static unsigned long __init compute_pernodesize(int node)
static unsigned long __meminit compute_pernodesize(int node)
{
unsigned long pernodesize = 0, cpus;
@ -792,6 +792,18 @@ void __init paging_init(void)
zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));
}
pg_data_t *arch_alloc_nodedata(int nid)
{
unsigned long size = compute_pernodesize(nid);
return kzalloc(size, GFP_KERNEL);
}
void arch_free_nodedata(pg_data_t *pgdat)
{
kfree(pgdat);
}
void arch_refresh_nodedata(int update_node, pg_data_t *update_pgdat)
{
pgdat_list[update_node] = update_pgdat;

9
include/linux/memory_hotplug.h
View File

@ -84,13 +84,8 @@ static inline int memory_add_physaddr_to_nid(u64 start)
* Now, arch_free_nodedata() is just defined for error path of node_hot_add.
*
*/
static inline pg_data_t *arch_alloc_nodedata(int nid)
{
return NULL;
}
static inline void arch_free_nodedata(pg_data_t *pgdat)
{
}
extern pg_data_t *arch_alloc_nodedata(int nid);
extern void arch_free_nodedata(pg_data_t *pgdat);
extern void arch_refresh_nodedata(int nid, pg_data_t *pgdat);
#else /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */