Skip to content

Commit

Permalink
s390: Use generic idle loop
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas 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: Cc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Link: http://lkml.kernel.org/r/20130321215235.090816526@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Thomas Gleixner committed Apr 8, 2013
1 parent 799fef0 commit 52c0065
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 30 deletions.
1 change: 1 addition & 0 deletions arch/s390/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ config S390
select CLONE_BACKWARDS2
select GENERIC_CLOCKEVENTS
select GENERIC_CPU_DEVICES if !SMP
select GENERIC_IDLE_LOOP
select GENERIC_KERNEL_THREAD
select GENERIC_SMP_IDLE_THREAD
select GENERIC_TIME_VSYSCALL_OLD
Expand Down
32 changes: 9 additions & 23 deletions arch/s390/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,8 @@ unsigned long thread_saved_pc(struct task_struct *tsk)
return sf->gprs[8];
}

/*
* The idle loop on a S390...
*/
static void default_idle(void)
void arch_cpu_idle(void)
{
if (cpu_is_offline(smp_processor_id()))
cpu_die();
local_irq_disable();
if (need_resched()) {
local_irq_enable();
return;
}
local_mcck_disable();
if (test_thread_flag(TIF_MCCK_PENDING)) {
local_mcck_enable();
Expand All @@ -83,19 +73,15 @@ static void default_idle(void)
vtime_stop_cpu();
}

void cpu_idle(void)
void arch_cpu_idle_exit(void)
{
for (;;) {
tick_nohz_idle_enter();
rcu_idle_enter();
while (!need_resched() && !test_thread_flag(TIF_MCCK_PENDING))
default_idle();
rcu_idle_exit();
tick_nohz_idle_exit();
if (test_thread_flag(TIF_MCCK_PENDING))
s390_handle_mcck();
schedule_preempt_disabled();
}
if (test_thread_flag(TIF_MCCK_PENDING))
s390_handle_mcck();
}

void arch_cpu_idle_dead(void)
{
cpu_die();
}

extern void __kprobes kernel_thread_starter(void);
Expand Down
3 changes: 1 addition & 2 deletions arch/s390/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -711,8 +711,7 @@ static void __cpuinit smp_start_secondary(void *cpuvoid)
set_cpu_online(smp_processor_id(), true);
inc_irq_stat(CPU_RST);
local_irq_enable();
/* cpu_idle will call schedule for us */
cpu_idle();
cpu_startup_entry(CPUHP_ONLINE);
}

/* Upping and downing of CPUs */
Expand Down
5 changes: 0 additions & 5 deletions arch/s390/kernel/vtime.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,6 @@ void __kprobes vtime_stop_cpu(void)
unsigned long psw_mask;

trace_hardirqs_on();
/* Don't trace preempt off for idle. */
stop_critical_timings();

/* Wait for external, I/O or machine check interrupt. */
psw_mask = psw_kernel_bits | PSW_MASK_WAIT | PSW_MASK_DAT |
Expand All @@ -169,9 +167,6 @@ void __kprobes vtime_stop_cpu(void)
/* Call the assembler magic in entry.S */
psw_idle(idle, psw_mask);

/* Reenable preemption tracer. */
start_critical_timings();

/* Account time spent with enabled wait psw loaded as idle time. */
idle->sequence++;
smp_wmb();
Expand Down

0 comments on commit 52c0065

Please sign in to comment.