aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Thompson <daniel.thompson@linaro.org>2016-03-26 14:47:58 +0000
committerDaniel Thompson <daniel.thompson@linaro.org>2016-03-26 14:47:58 +0000
commit5e566332dbf9c15b4d161e968f7e27c3e2528092 (patch)
treeab4c6b3a0541364d9f66b651eede09137aed4285
parent62a1b30a65ff6137d0368f41c56a3faedf9d314d (diff)
downloadlinux-dev/arm64_nmi-v4.5.tar.gz
fixup: Removing spurious merge tagsdev/arm64_nmi-v4.5
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
-rw-r--r--arch/arm64/kernel/entry.S4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index dc7daedc9060..00e8764712b3 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -491,16 +491,14 @@ el1_irq:
enable_dbg
trace_hardirqs_off x23
-<<<<<<< HEAD
get_thread_info tsk
-=======
+
/*
* On systems with CONFIG_USE_ICC_SYSREGS_FOR_IRQFLAGS then
* we do not yet know if this IRQ is a pseudo-NMI or a normal
* interrupt. For that reason we must rely on the irq_handler to
* enable the NMI once the interrupt type is determined.
*/
->>>>>>> 82e52037fb34... arm64: Implement IPI_CPU_BACKTRACE using pseudo-NMIs
irq_handler
#ifdef CONFIG_PREEMPT