From a597870b615c0f175863cfeceef1045503b522c2 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Fri, 14 Nov 2008 18:18:04 +0100 Subject: [PATCH] --- yaml --- r: 119013 b: refs/heads/master c: 632448f65001c4935ed0d3bb362017d773da2eca h: refs/heads/master i: 119011: 6d4c72ac719f90ae3bb842030b1b646881c1c541 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/process.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 49381614b38f..47465bf359bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af4c68740e848019d8d14c52704ed8eacceddac6 +refs/heads/master: 632448f65001c4935ed0d3bb362017d773da2eca diff --git a/trunk/arch/s390/kernel/process.c b/trunk/arch/s390/kernel/process.c index 3e2c05cb6a87..04f8c67a6101 100644 --- a/trunk/arch/s390/kernel/process.c +++ b/trunk/arch/s390/kernel/process.c @@ -136,9 +136,12 @@ static void default_idle(void) return; } trace_hardirqs_on(); + /* Don't trace preempt off for idle. */ + stop_critical_timings(); /* Wait for external, I/O or machine check interrupt. */ __load_psw_mask(psw_kernel_bits | PSW_MASK_WAIT | PSW_MASK_IO | PSW_MASK_EXT); + start_critical_timings(); } void cpu_idle(void)