git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
mips
/
kernel
/
smp-cmp.c
diff --git
a/arch/mips/kernel/smp-cmp.c
b/arch/mips/kernel/smp-cmp.c
index
ad0ff5d
..
cc81771
100644
(file)
--- a/
arch/mips/kernel/smp-cmp.c
+++ b/
arch/mips/kernel/smp-cmp.c
@@
-80,11
+80,11
@@
void cmp_send_ipi_single(int cpu, unsigned int action)
local_irq_restore(flags);
}
local_irq_restore(flags);
}
-static void cmp_send_ipi_mask(c
pumask_t
mask, unsigned int action)
+static void cmp_send_ipi_mask(c
onst struct cpumask *
mask, unsigned int action)
{
unsigned int i;
{
unsigned int i;
- for_each_cpu
_mask
(i, mask)
+ for_each_cpu(i, mask)
cmp_send_ipi_single(i, action);
}
cmp_send_ipi_single(i, action);
}
@@
-171,7
+171,7
@@
void __init cmp_smp_setup(void)
for (i = 1; i < NR_CPUS; i++) {
if (amon_cpu_avail(i)) {
for (i = 1; i < NR_CPUS; i++) {
if (amon_cpu_avail(i)) {
-
cpu_set(i, cpu_possible_map
);
+
set_cpu_possible(i, true
);
__cpu_number_map[i] = ++ncpu;
__cpu_logical_map[ncpu] = i;
}
__cpu_number_map[i] = ++ncpu;
__cpu_logical_map[ncpu] = i;
}