Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5385
b: refs/heads/master
c: 69cb62e
h: refs/heads/master
i:
  5383: ac07ef5
v: v3
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Jul 29, 2005
1 parent 9660b2f commit aaa08df
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b684664fd495fd640353c0f786751763db77dcfb
refs/heads/master: 69cb62eb6dceb0da701e04395d3b412a0648c118
5 changes: 4 additions & 1 deletion trunk/arch/x86_64/mm/srat.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)

if (srat_disabled() || ma->flags.enabled == 0)
return;
/* hotplug bit is ignored for now */
pxm = ma->proximity_domain;
node = setup_node(pxm);
if (node < 0) {
Expand All @@ -134,6 +133,10 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
}
start = ma->base_addr_lo | ((u64)ma->base_addr_hi << 32);
end = start + (ma->length_lo | ((u64)ma->length_hi << 32));
/* It is fine to add this area to the nodes data it will be used later*/
if (ma->flags.hot_pluggable == 1)
printk(KERN_INFO "SRAT: hot plug zone found %lx - %lx \n",
start, end);
i = conflicting_nodes(start, end);
if (i >= 0) {
printk(KERN_ERR
Expand Down

0 comments on commit aaa08df

Please sign in to comment.