git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
alpha
/
mm
/
numa.c
diff --git
a/arch/alpha/mm/numa.c
b/arch/alpha/mm/numa.c
index
2cb8fa4
..
a839578
100644
(file)
--- a/
arch/alpha/mm/numa.c
+++ b/
arch/alpha/mm/numa.c
@@
-279,8
+279,8
@@
setup_memory(void *kernel_end)
initrd_end,
phys_to_virt(PFN_PHYS(max_low_pfn)));
} else {
initrd_end,
phys_to_virt(PFN_PHYS(max_low_pfn)));
} else {
- nid =
NODE_DATA(kvaddr_to_nid(initrd_start)
);
- reserve_bootmem_node(
nid
,
+ nid =
kvaddr_to_nid(initrd_start
);
+ reserve_bootmem_node(
NODE_DATA(nid)
,
virt_to_phys((void *)initrd_start),
INITRD_SIZE);
}
virt_to_phys((void *)initrd_start),
INITRD_SIZE);
}
@@
-313,7
+313,7
@@
void __init paging_init(void)
zones_size[ZONE_DMA] = dma_local_pfn;
zones_size[ZONE_NORMAL] = (end_pfn - start_pfn) - dma_local_pfn;
}
zones_size[ZONE_DMA] = dma_local_pfn;
zones_size[ZONE_NORMAL] = (end_pfn - start_pfn) - dma_local_pfn;
}
- free_area_init_node(nid, NODE_DATA(nid),
NULL,
zones_size, start_pfn, NULL);
+ free_area_init_node(nid, NODE_DATA(nid), zones_size, start_pfn, NULL);
}
/* Initialize the kernel's ZERO_PGE. */
}
/* Initialize the kernel's ZERO_PGE. */
@@
-371,7
+371,7
@@
show_mem(void)
printk("\nMem-info:\n");
show_free_areas();
printk("\nMem-info:\n");
show_free_areas();
- printk("Free swap: %6
dkB\n",
nr_swap_pages<<(PAGE_SHIFT-10));
+ printk("Free swap: %6
ldkB\n",
nr_swap_pages<<(PAGE_SHIFT-10));
for (nid = 0; nid < numnodes; nid++) {
struct page * lmem_map = node_mem_map(nid);
i = node_spanned_pages(nid);
for (nid = 0; nid < numnodes; nid++) {
struct page * lmem_map = node_mem_map(nid);
i = node_spanned_pages(nid);