|
@@ -493,14 +493,6 @@ static int __init numa_register_memblks(struct numa_meminfo *mi)
|
|
struct numa_memblk *mb = &mi->blk[i];
|
|
struct numa_memblk *mb = &mi->blk[i];
|
|
memblock_set_node(mb->start, mb->end - mb->start,
|
|
memblock_set_node(mb->start, mb->end - mb->start,
|
|
&memblock.memory, mb->nid);
|
|
&memblock.memory, mb->nid);
|
|
-
|
|
|
|
- /*
|
|
|
|
- * At this time, all memory regions reserved by memblock are
|
|
|
|
- * used by the kernel. Set the nid in memblock.reserved will
|
|
|
|
- * mark out all the nodes the kernel resides in.
|
|
|
|
- */
|
|
|
|
- memblock_set_node(mb->start, mb->end - mb->start,
|
|
|
|
- &memblock.reserved, mb->nid);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -569,6 +561,17 @@ static void __init numa_clear_kernel_node_hotplug(void)
|
|
unsigned long start, end;
|
|
unsigned long start, end;
|
|
struct memblock_type *type = &memblock.reserved;
|
|
struct memblock_type *type = &memblock.reserved;
|
|
|
|
|
|
|
|
+ /*
|
|
|
|
+ * At this time, all memory regions reserved by memblock are
|
|
|
|
+ * used by the kernel. Set the nid in memblock.reserved will
|
|
|
|
+ * mark out all the nodes the kernel resides in.
|
|
|
|
+ */
|
|
|
|
+ for (i = 0; i < numa_meminfo.nr_blks; i++) {
|
|
|
|
+ struct numa_memblk *mb = &numa_meminfo.blk[i];
|
|
|
|
+ memblock_set_node(mb->start, mb->end - mb->start,
|
|
|
|
+ &memblock.reserved, mb->nid);
|
|
|
|
+ }
|
|
|
|
+
|
|
/* Mark all kernel nodes. */
|
|
/* Mark all kernel nodes. */
|
|
for (i = 0; i < type->cnt; i++)
|
|
for (i = 0; i < type->cnt; i++)
|
|
node_set(type->regions[i].nid, numa_kernel_nodes);
|
|
node_set(type->regions[i].nid, numa_kernel_nodes);
|