Skip to content

Commit

Permalink
cris: Use generic idle thread allocation
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Link: http://lkml.kernel.org/r/20120420124557.789657793@linutronix.de
  • Loading branch information
Thomas Gleixner committed Apr 26, 2012
1 parent e80e781 commit a4cfc31
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
1 change: 1 addition & 0 deletions arch/cris/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ config CRIS
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
select GENERIC_IOMAP
select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32

config HZ
int
Expand Down
12 changes: 2 additions & 10 deletions arch/cris/arch-v32/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,12 @@ void __init smp_cpus_done(unsigned int max_cpus)

/* Bring one cpu online.*/
static int __init
smp_boot_one_cpu(int cpuid)
smp_boot_one_cpu(int cpuid, struct task_struct idle)
{
unsigned timeout;
struct task_struct *idle;
cpumask_t cpu_mask;

cpumask_clear(&cpu_mask);
idle = fork_idle(cpuid);
if (IS_ERR(idle))
panic("SMP: fork failed for CPU:%d", cpuid);

task_thread_info(idle)->cpu = cpuid;

/* Information to the CPU that is about to boot */
Expand All @@ -142,9 +137,6 @@ smp_boot_one_cpu(int cpuid)
barrier();
}

put_task_struct(idle);
idle = NULL;

printk(KERN_CRIT "SMP: CPU:%d is stuck.\n", cpuid);
return -1;
}
Expand Down Expand Up @@ -209,7 +201,7 @@ unsigned long cache_decay_ticks = 1;

int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
{
smp_boot_one_cpu(cpu);
smp_boot_one_cpu(cpu, tidle);
return cpu_online(cpu) ? 0 : -ENOSYS;
}

Expand Down

0 comments on commit a4cfc31

Please sign in to comment.