diff options
| author | Andi Kleen <ak@suse.de> | 2006-03-25 10:29:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 12:10:52 -0500 |
| commit | abe059e7590fd4475285f2d037c70dec712a4572 (patch) | |
| tree | 4c15ffcf11786a89cd87d0766c6d6717342aa722 /include/asm-x86_64 | |
| parent | 913bd906019514579b3c7ec5ab9c463e89207a57 (diff) | |
[PATCH] x86_64: Rename struct node in x86-64 NUMA code to struct bootnode
It conflicts with the struct node in node.h
Actually the x86-64 version was there first, but ..
Suggested by Jan Beulich
Cc: jbeulich@novell.com
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-x86_64')
| -rw-r--r-- | include/asm-x86_64/numa.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86_64/numa.h b/include/asm-x86_64/numa.h index dffe276ca2df..f6cbb4cbb5a3 100644 --- a/include/asm-x86_64/numa.h +++ b/include/asm-x86_64/numa.h | |||
| @@ -4,11 +4,11 @@ | |||
| 4 | #include <linux/nodemask.h> | 4 | #include <linux/nodemask.h> |
| 5 | #include <asm/numnodes.h> | 5 | #include <asm/numnodes.h> |
| 6 | 6 | ||
| 7 | struct node { | 7 | struct bootnode { |
| 8 | u64 start,end; | 8 | u64 start,end; |
| 9 | }; | 9 | }; |
| 10 | 10 | ||
| 11 | extern int compute_hash_shift(struct node *nodes, int numnodes); | 11 | extern int compute_hash_shift(struct bootnode *nodes, int numnodes); |
| 12 | extern int pxm_to_node(int nid); | 12 | extern int pxm_to_node(int nid); |
| 13 | 13 | ||
| 14 | #define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT)) | 14 | #define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT)) |