From 3732106a1a565a592966290fbcef322db9933f91 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Sun, 27 May 2012 23:35:16 +0200 Subject: [PATCH] sparc32: refactor cpu_idle() With the removal of sun4c we can use the same cpu_idle() implementation on UP and SMP. This also fix it so we use the same version independent on LEON enabled or not. V2: Fixed whitespace issue pointed out by Josip Rodin. Signed-off-by: Sam Ravnborg Cc: Josip Rodin Cc: Daniel Hellstrom Cc: Konrad Eisele --- arch/sparc/kernel/process_32.c | 35 +++++----------------------------- 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c index fe6787cc62fc..cb36e82dcd5d 100644 --- a/arch/sparc/kernel/process_32.c +++ b/arch/sparc/kernel/process_32.c @@ -65,50 +65,25 @@ extern void fpsave(unsigned long *, unsigned long *, void *, unsigned long *); struct task_struct *last_task_used_math = NULL; struct thread_info *current_set[NR_CPUS]; -#ifndef CONFIG_SMP - /* * the idle loop on a Sparc... ;) */ void cpu_idle(void) { + set_thread_flag(TIF_POLLING_NRFLAG); + /* endless idle loop with no priority at all */ for (;;) { - if (pm_idle) { - while (!need_resched()) + while (!need_resched()) { + if (pm_idle) (*pm_idle)(); - } else { - while (!need_resched()) + else cpu_relax(); } schedule_preempt_disabled(); } } -#else - -/* This is being executed in task 0 'user space'. */ -void cpu_idle(void) -{ - set_thread_flag(TIF_POLLING_NRFLAG); - /* endless idle loop with no priority at all */ - while(1) { -#ifdef CONFIG_SPARC_LEON - if (pm_idle) { - while (!need_resched()) - (*pm_idle)(); - } else -#endif - { - while (!need_resched()) - cpu_relax(); - } - schedule_preempt_disabled(); - } -} - -#endif - /* XXX cli/sti -> local_irq_xxx here, check this works once SMP is fixed. */ void machine_halt(void) {