summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuriy Kolerov <yuriy.kolerov@synopsys.com>2016-09-12 18:55:03 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-22 12:06:46 +0200
commitb19ad40595587a045ca703e32aa1b9f4acd666bd (patch)
treeaac4fcae6fe8eac5abe02017e0f07750cf012307
parentfedf90584600c18be041d8a38c0024e4590c9643 (diff)
downloadlinux-stable-b19ad40595587a045ca703e32aa1b9f4acd666bd.tar.gz
linux-stable-b19ad40595587a045ca703e32aa1b9f4acd666bd.tar.bz2
linux-stable-b19ad40595587a045ca703e32aa1b9f4acd666bd.zip
ARCv2: intc: Use kflag if STATUS32.IE must be reset
commit bc0c7ece6191d89f435e4e4016f74167430c6c21 upstream. In the end of "arc_init_IRQ" STATUS32.IE flag is going to be affected by "flag" instruction but "flag" never touches IE flag on ARCv2. So "kflag" instruction must be used instead of "flag". Signed-off-by: Yuriy Kolerov <yuriy.kolerov@synopsys.com> Signed-off-by: Vineet Gupta <vgupta@synopsys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arc/kernel/intc-arcv2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/kernel/intc-arcv2.c b/arch/arc/kernel/intc-arcv2.c
index 6c24faf48b16..62b59409a5d9 100644
--- a/arch/arc/kernel/intc-arcv2.c
+++ b/arch/arc/kernel/intc-arcv2.c
@@ -74,7 +74,7 @@ void arc_init_IRQ(void)
tmp = read_aux_reg(0xa);
tmp |= STATUS_AD_MASK | (irq_prio << 1);
tmp &= ~STATUS_IE_MASK;
- asm volatile("flag %0 \n"::"r"(tmp));
+ asm volatile("kflag %0 \n"::"r"(tmp));
}
static void arcv2_irq_mask(struct irq_data *data)