Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dc7c5ec authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

cris: Use generic idle loop 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Paul McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Reviewed-by: default avatarCc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Acked-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
Link: http://lkml.kernel.org/r/20130321215234.148829489@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent e46746cd

arch/cris/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ config CRIS 
	select GENERIC_IRQ_SHOW

	select GENERIC_IOMAP

	select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32

	select GENERIC_IDLE_LOOP

	select GENERIC_CMOS_UPDATE

	select MODULES_USE_ELF_RELA

	select CLONE_BACKWARDS2

arch/cris/arch-v10/kernel/process.c

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ void default_idle(void) 
#ifdef CONFIG_ETRAX_GPIO

	etrax_gpio_wake_up_check();

#endif

	local_irq_enable();

}



/*

arch/cris/arch-v32/kernel/process.c

+3 −7
Original line number Diff line number Diff line
@@ -23,14 +23,10 @@ extern void stop_watchdog(void); 
/* We use this if we don't have any better idle routine. */

void default_idle(void)

{

	local_irq_disable();

	if (!need_resched()) {

	/* Halt until exception. */

	__asm__ volatile("ei    \n\t"

			 "halt      ");

}

	local_irq_enable();

}



/*

 * Free current thread data structures etc..

arch/cris/arch-v32/kernel/smp.c

+1 −3
Original line number Diff line number Diff line
@@ -145,8 +145,6 @@ smp_boot_one_cpu(int cpuid, struct task_struct idle) 
 * specific stuff such as the local timer and the MMU. */

void __init smp_callin(void)

{

	extern void cpu_idle(void);



	int cpu = cpu_now_booting;

	reg_intr_vect_rw_mask vect_mask = {0};
@@ -170,7 +168,7 @@ void __init smp_callin(void) 
	local_irq_enable();



	set_cpu_online(cpu, true);

	cpu_idle();

	cpu_startup_entry(CPUHP_ONLINE);

}



/* Stop execution on this CPU.*/

arch/cris/kernel/process.c

+2 −22
Original line number Diff line number Diff line
@@ -34,30 +34,10 @@ extern void default_idle(void); 
void (*pm_power_off)(void);

EXPORT_SYMBOL(pm_power_off);



/*

 * The idle thread. There's no useful work to be

 * done, so just try to conserve power and have a

 * low exit latency (ie sit in a loop waiting for

 * somebody to say that they'd like to reschedule)

 */



void cpu_idle (void)

void arch_cpu_idle(void)

{

	/* endless idle loop with no priority at all */

	while (1) {

		rcu_idle_enter();

		while (!need_resched()) {

			/*

			 * Mark this as an RCU critical section so that

			 * synchronize_kernel() in the unload path waits

			 * for our completion.

			 */

	default_idle();

}

		rcu_idle_exit();

		schedule_preempt_disabled();

	}

}



void hard_reset_now (void);