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

Commit 4d0e42cc authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Ingo Molnar
Browse files

x86: Remove dead hlt_use_halt code 



The hlt_use_halt function returns always true and there is only
one definition of it.

The default_idle function can then get ride of the if ...
statement and we can remove the else branch.

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Cc: linaro-dev@lists.linaro.org
Cc: patches@linaro.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1351181591-8710-1-git-send-email-daniel.lezcano@linaro.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 2ab3f29d

arch/x86/kernel/process.c

+14 −25
Original line number Diff line number Diff line
@@ -306,11 +306,6 @@ void (*pm_idle)(void); 
EXPORT_SYMBOL(pm_idle);

#endif



static inline int hlt_use_halt(void)

{

	return 1;

}



#ifndef CONFIG_SMP

static inline void play_dead(void)

{
@@ -410,7 +405,6 @@ void cpu_idle(void) 
 */

void default_idle(void)

{

	if (hlt_use_halt()) {

	trace_power_start_rcuidle(POWER_CSTATE, 1, smp_processor_id());

	trace_cpu_idle_rcuidle(1, smp_processor_id());

	current_thread_info()->status &= ~TS_POLLING;
@@ -427,11 +421,6 @@ void default_idle(void) 
	current_thread_info()->status |= TS_POLLING;

	trace_power_end_rcuidle(smp_processor_id());

	trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id());

	} else {

		local_irq_enable();

		/* loop is done by the caller */

		cpu_relax();

	}

}

#ifdef CONFIG_APM_MODULE

EXPORT_SYMBOL(default_idle);