From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 1 Dec 2014 13:24:41 +0000 (+0100)
Subject: s390/idle: add missing irq off lockdep annotation
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=200e7c0ffb1b174a4aeaa05f7f43a91ac0fddde3;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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>
---

diff --git a/arch/s390/kernel/idle.c b/arch/s390/kernel/idle.c
index 05fbc2c98faf..8814dd9cf644 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();