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
Pull acpica into release branch
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
smp.c
diff --git
a/arch/alpha/kernel/smp.c
b/arch/alpha/kernel/smp.c
index
02c2db0
..
4dc273e
100644
(file)
--- a/
arch/alpha/kernel/smp.c
+++ b/
arch/alpha/kernel/smp.c
@@
-68,7
+68,6
@@
enum ipi_message_type {
static int smp_secondary_alive __initdata = 0;
/* Which cpus ids came online. */
static int smp_secondary_alive __initdata = 0;
/* Which cpus ids came online. */
-cpumask_t cpu_present_mask;
cpumask_t cpu_online_map;
EXPORT_SYMBOL(cpu_online_map);
cpumask_t cpu_online_map;
EXPORT_SYMBOL(cpu_online_map);
@@
-439,7
+438,7
@@
setup_smp(void)
if ((cpu->flags & 0x1cc) == 0x1cc) {
smp_num_probed++;
/* Assume here that "whami" == index */
if ((cpu->flags & 0x1cc) == 0x1cc) {
smp_num_probed++;
/* Assume here that "whami" == index */
- cpu_set(i, cpu_p
ossible
_map);
+ cpu_set(i, cpu_p
resent
_map);
cpu->pal_revision = boot_cpu_palrev;
}
cpu->pal_revision = boot_cpu_palrev;
}
@@
-450,12
+449,10
@@
setup_smp(void)
}
} else {
smp_num_probed = 1;
}
} else {
smp_num_probed = 1;
- cpu_set(boot_cpuid, cpu_possible_map);
}
}
- cpu_present_mask = cpumask_of_cpu(boot_cpuid);
- printk(KERN_INFO "SMP: %d CPUs probed -- cpu_present_ma
sk
= %lx\n",
- smp_num_probed, cpu_p
ossible
_map.bits[0]);
+ printk(KERN_INFO "SMP: %d CPUs probed -- cpu_present_ma
p
= %lx\n",
+ smp_num_probed, cpu_p
resent
_map.bits[0]);
}
/*
}
/*
@@
-474,7
+471,7
@@
smp_prepare_cpus(unsigned int max_cpus)
/* Nothing to do on a UP box, or when told not to. */
if (smp_num_probed == 1 || max_cpus == 0) {
/* Nothing to do on a UP box, or when told not to. */
if (smp_num_probed == 1 || max_cpus == 0) {
- cpu_present_ma
sk
= cpumask_of_cpu(boot_cpuid);
+ cpu_present_ma
p
= cpumask_of_cpu(boot_cpuid);
printk(KERN_INFO "SMP mode deactivated.\n");
return;
}
printk(KERN_INFO "SMP mode deactivated.\n");
return;
}
@@
-487,11
+484,6
@@
smp_prepare_cpus(unsigned int max_cpus)
void __devinit
smp_prepare_boot_cpu(void)
{
void __devinit
smp_prepare_boot_cpu(void)
{
- /*
- * Mark the boot cpu (current cpu) as both present and online
- */
- cpu_set(smp_processor_id(), cpu_present_mask);
- cpu_set(smp_processor_id(), cpu_online_map);
}
int __devinit
}
int __devinit