git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda' into for-linus
[pandora-kernel.git]
/
drivers
/
acpi
/
numa.c
diff --git
a/drivers/acpi/numa.c
b/drivers/acpi/numa.c
index
b872546
..
b0337d3
100644
(file)
--- a/
drivers/acpi/numa.c
+++ b/
drivers/acpi/numa.c
@@
-61,8
+61,10
@@
int node_to_pxm(int node)
void __acpi_map_pxm_to_node(int pxm, int node)
{
void __acpi_map_pxm_to_node(int pxm, int node)
{
- pxm_to_node_map[pxm] = node;
- node_to_pxm_map[node] = pxm;
+ if (pxm_to_node_map[pxm] == NUMA_NO_NODE || node < pxm_to_node_map[pxm])
+ pxm_to_node_map[pxm] = node;
+ if (node_to_pxm_map[node] == PXM_INVAL || pxm < node_to_pxm_map[node])
+ node_to_pxm_map[node] = pxm;
}
int acpi_map_pxm_to_node(int pxm)
}
int acpi_map_pxm_to_node(int pxm)