summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2014-12-01 13:24:41 (GMT)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2014-12-08 08:42:31 (GMT)
commit200e7c0ffb1b174a4aeaa05f7f43a91ac0fddde3 (patch)
tree2a4e6664ce892e848a2699e3e2edf8b763534436 /arch/s390
parent832a771034bf62444796ab8868264c3ea9e50866 (diff)
downloadlinux-200e7c0ffb1b174a4aeaa05f7f43a91ac0fddde3.tar.xz
s390/idle: add missing irq off lockdep annotation
psw_idle() returns with interrupts disabled, so we should add the missing annotation. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/idle.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/idle.c b/arch/s390/kernel/idle.c
index 05fbc2c..8814dd9 100644
--- a/arch/s390/kernel/idle.c
+++ b/arch/s390/kernel/idle.c
@@ -35,6 +35,8 @@ void enabled_wait(void)
/* Call the assembler magic in entry.S */
psw_idle(idle, psw_mask);
+ trace_hardirqs_off();
+
/* Account time spent with enabled wait psw loaded as idle time. */
idle->sequence++;
smp_wmb();