Commit de9c4ad8 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] sparse: alpha topology.h compile fix

	Missing bits of cpumask_t conversion
parent 33ebcaa2
...@@ -22,17 +22,17 @@ static inline int cpu_to_node(int cpu) ...@@ -22,17 +22,17 @@ static inline int cpu_to_node(int cpu)
return node; return node;
} }
static inline int node_to_cpumask(int node) static inline cpumask_t node_to_cpumask(int node)
{ {
unsigned long node_cpu_mask = 0; cpumask_t node_cpu_mask = CPU_MASK_NONE;
int cpu; int cpu;
for(cpu = 0; cpu < NR_CPUS; cpu++) { for(cpu = 0; cpu < NR_CPUS; cpu++) {
if (cpu_online(cpu) && (cpu_to_node(cpu) == node)) if (cpu_online(cpu) && (cpu_to_node(cpu) == node))
node_cpu_mask |= 1UL << cpu; cpu_set(cpu, node_cpu_mask);
} }
#if DEBUG_NUMA #ifdef DEBUG_NUMA
printk("node %d: cpu_mask: %016lx\n", node, node_cpu_mask); printk("node %d: cpu_mask: %016lx\n", node, node_cpu_mask);
#endif #endif
...@@ -42,6 +42,8 @@ static inline int node_to_cpumask(int node) ...@@ -42,6 +42,8 @@ static inline int node_to_cpumask(int node)
/* Cross-node load balancing interval. */ /* Cross-node load balancing interval. */
# define NODE_BALANCE_RATE 10 # define NODE_BALANCE_RATE 10
#define pcibus_to_cpumask(bus) (cpu_online_map)
#else /* CONFIG_NUMA */ #else /* CONFIG_NUMA */
# include <asm-generic/topology.h> # include <asm-generic/topology.h>
#endif /* !CONFIG_NUMA */ #endif /* !CONFIG_NUMA */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment