diff options
author | Andi Kleen <ak@suse.de> | 2006-01-11 16:43:48 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:04:52 -0500 |
commit | e4e94072d9c3b19662537cbd5e2d37bcaeed3d9b (patch) | |
tree | 1d2c1c61319ea999703090023551204606525a1d /arch/x86_64 | |
parent | 819a692804a8d2d42b7bb033d2650dba47622149 (diff) |
[PATCH] x86_64: Return -1 for unknown PCI bus affinity
When we don't know the node a PCI bus is connected to return -1.
This matches the generic code.
Noticed by Ravikiran G Thirumalai <kiran@scalex86.org>
Cc: Ravikiran G Thirumalai <kiran@scalex86.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
-rw-r--r-- | arch/x86_64/mm/srat.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86_64/mm/srat.c b/arch/x86_64/mm/srat.c index 9f69d28652f8..d96c701dbed6 100644 --- a/arch/x86_64/mm/srat.c +++ b/arch/x86_64/mm/srat.c | |||
@@ -23,15 +23,16 @@ static struct acpi_table_slit *acpi_slit; | |||
23 | static nodemask_t nodes_parsed __initdata; | 23 | static nodemask_t nodes_parsed __initdata; |
24 | static nodemask_t nodes_found __initdata; | 24 | static nodemask_t nodes_found __initdata; |
25 | static struct node nodes[MAX_NUMNODES] __initdata; | 25 | static struct node nodes[MAX_NUMNODES] __initdata; |
26 | static __u8 pxm2node[256] = { [0 ... 255] = 0xff }; | 26 | static u8 pxm2node[256] = { [0 ... 255] = 0xff }; |
27 | 27 | ||
28 | static int node_to_pxm(int n); | 28 | static int node_to_pxm(int n); |
29 | 29 | ||
30 | int pxm_to_node(int pxm) | 30 | int pxm_to_node(int pxm) |
31 | { | 31 | { |
32 | if ((unsigned)pxm >= 256) | 32 | if ((unsigned)pxm >= 256) |
33 | return 0; | 33 | return -1; |
34 | return pxm2node[pxm]; | 34 | /* Extend 0xff to (int)-1 */ |
35 | return (signed char)pxm2node[pxm]; | ||
35 | } | 36 | } |
36 | 37 | ||
37 | static __init int setup_node(int pxm) | 38 | static __init int setup_node(int pxm) |