diff options
Diffstat (limited to 'include/asm-x86/topology.h')
-rw-r--r-- | include/asm-x86/topology.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h index 98e5f17ea856..90ac7718469a 100644 --- a/include/asm-x86/topology.h +++ b/include/asm-x86/topology.h | |||
@@ -82,7 +82,7 @@ DECLARE_EARLY_PER_CPU(int, x86_cpu_to_node_map); | |||
82 | #ifdef CONFIG_DEBUG_PER_CPU_MAPS | 82 | #ifdef CONFIG_DEBUG_PER_CPU_MAPS |
83 | extern int cpu_to_node(int cpu); | 83 | extern int cpu_to_node(int cpu); |
84 | extern int early_cpu_to_node(int cpu); | 84 | extern int early_cpu_to_node(int cpu); |
85 | extern cpumask_t *_node_to_cpumask_ptr(int node); | 85 | extern const cpumask_t *_node_to_cpumask_ptr(int node); |
86 | extern cpumask_t node_to_cpumask(int node); | 86 | extern cpumask_t node_to_cpumask(int node); |
87 | 87 | ||
88 | #else /* !CONFIG_DEBUG_PER_CPU_MAPS */ | 88 | #else /* !CONFIG_DEBUG_PER_CPU_MAPS */ |
@@ -103,7 +103,7 @@ static inline int early_cpu_to_node(int cpu) | |||
103 | } | 103 | } |
104 | 104 | ||
105 | /* Returns a pointer to the cpumask of CPUs on Node 'node'. */ | 105 | /* Returns a pointer to the cpumask of CPUs on Node 'node'. */ |
106 | static inline cpumask_t *_node_to_cpumask_ptr(int node) | 106 | static inline const cpumask_t *_node_to_cpumask_ptr(int node) |
107 | { | 107 | { |
108 | return &node_to_cpumask_map[node]; | 108 | return &node_to_cpumask_map[node]; |
109 | } | 109 | } |
@@ -118,7 +118,7 @@ static inline cpumask_t node_to_cpumask(int node) | |||
118 | 118 | ||
119 | /* Replace default node_to_cpumask_ptr with optimized version */ | 119 | /* Replace default node_to_cpumask_ptr with optimized version */ |
120 | #define node_to_cpumask_ptr(v, node) \ | 120 | #define node_to_cpumask_ptr(v, node) \ |
121 | cpumask_t *v = _node_to_cpumask_ptr(node) | 121 | const cpumask_t *v = _node_to_cpumask_ptr(node) |
122 | 122 | ||
123 | #define node_to_cpumask_ptr_next(v, node) \ | 123 | #define node_to_cpumask_ptr_next(v, node) \ |
124 | v = _node_to_cpumask_ptr(node) | 124 | v = _node_to_cpumask_ptr(node) |
@@ -186,7 +186,7 @@ extern int __node_distance(int, int); | |||
186 | #define cpu_to_node(cpu) 0 | 186 | #define cpu_to_node(cpu) 0 |
187 | #define early_cpu_to_node(cpu) 0 | 187 | #define early_cpu_to_node(cpu) 0 |
188 | 188 | ||
189 | static inline cpumask_t *_node_to_cpumask_ptr(int node) | 189 | static inline const cpumask_t *_node_to_cpumask_ptr(int node) |
190 | { | 190 | { |
191 | return &cpu_online_map; | 191 | return &cpu_online_map; |
192 | } | 192 | } |
@@ -201,7 +201,7 @@ static inline int node_to_first_cpu(int node) | |||
201 | 201 | ||
202 | /* Replace default node_to_cpumask_ptr with optimized version */ | 202 | /* Replace default node_to_cpumask_ptr with optimized version */ |
203 | #define node_to_cpumask_ptr(v, node) \ | 203 | #define node_to_cpumask_ptr(v, node) \ |
204 | cpumask_t *v = _node_to_cpumask_ptr(node) | 204 | const cpumask_t *v = _node_to_cpumask_ptr(node) |
205 | 205 | ||
206 | #define node_to_cpumask_ptr_next(v, node) \ | 206 | #define node_to_cpumask_ptr_next(v, node) \ |
207 | v = _node_to_cpumask_ptr(node) | 207 | v = _node_to_cpumask_ptr(node) |