diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
| commit | a748422ee45725e04e1d3792fa19dfa90ddfd116 (patch) | |
| tree | 978e12895468baaa9f7ab2747b9f7d50beaf1717 /include/asm-x86_64/numa.h | |
| parent | c63e31c2cc1ec67372920b5e1aff8204d04dd172 (diff) | |
| parent | f4ffaa452e71495a06376f12f772342bc57051fc (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-x86_64/numa.h')
| -rw-r--r-- | include/asm-x86_64/numa.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-x86_64/numa.h b/include/asm-x86_64/numa.h index f6cbb4cbb5a3..1cc92fe02503 100644 --- a/include/asm-x86_64/numa.h +++ b/include/asm-x86_64/numa.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _ASM_X8664_NUMA_H 1 | 2 | #define _ASM_X8664_NUMA_H 1 |
| 3 | 3 | ||
| 4 | #include <linux/nodemask.h> | 4 | #include <linux/nodemask.h> |
| 5 | #include <asm/numnodes.h> | ||
| 6 | 5 | ||
| 7 | struct bootnode { | 6 | struct bootnode { |
| 8 | u64 start,end; | 7 | u64 start,end; |
| @@ -18,6 +17,8 @@ extern void numa_init_array(void); | |||
| 18 | extern int numa_off; | 17 | extern int numa_off; |
| 19 | 18 | ||
| 20 | extern void numa_set_node(int cpu, int node); | 19 | extern void numa_set_node(int cpu, int node); |
| 20 | extern void srat_reserve_add_area(int nodeid); | ||
| 21 | extern int hotadd_percent; | ||
| 21 | 22 | ||
| 22 | extern unsigned char apicid_to_node[256]; | 23 | extern unsigned char apicid_to_node[256]; |
| 23 | #ifdef CONFIG_NUMA | 24 | #ifdef CONFIG_NUMA |