summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/mips64/kernel/smp.c2
-rw-r--r--arch/mips64/sgi-ip27/ip27-init.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips64/kernel/smp.c b/arch/mips64/kernel/smp.c
index 655d2add2..94673e078 100644
--- a/arch/mips64/kernel/smp.c
+++ b/arch/mips64/kernel/smp.c
@@ -57,7 +57,7 @@ spinlock_t kernel_flag = SPIN_LOCK_UNLOCKED;
int smp_threads_ready; /* Not used */
atomic_t smp_commenced = ATOMIC_INIT(0);
struct cpuinfo_mips cpu_data[NR_CPUS];
-int smp_num_cpus; /* Number that came online. */
+int smp_num_cpus = 1; /* Number that came online. */
int __cpu_number_map[NR_CPUS];
int __cpu_logical_map[NR_CPUS];
cycles_t cacheflush_time;
diff --git a/arch/mips64/sgi-ip27/ip27-init.c b/arch/mips64/sgi-ip27/ip27-init.c
index fdc3fdf27..c103969f3 100644
--- a/arch/mips64/sgi-ip27/ip27-init.c
+++ b/arch/mips64/sgi-ip27/ip27-init.c
@@ -472,9 +472,9 @@ void allowboot(void)
sprintf(p->comm, "%s%d", "Idle", num_cpus);
init_tasks[num_cpus] = p;
alloc_cpupda(cpu, num_cpus);
+ del_from_runqueue(p);
p->processor = num_cpus;
p->has_cpu = 1; /* we schedule the first task manually */
- del_from_runqueue(p);
unhash_process(p);
/* Attach to the address space of init_task. */
atomic_inc(&init_mm.mm_count);