summaryrefslogtreecommitdiff
authorTao Zeng <tao.zeng@amlogic.com>2019-12-12 03:12:44 (GMT)
committer Shen Liu <shen.liu@amlogic.com>2020-05-13 07:02:35 (GMT)
commit1708a8506cbb58eac2d6fc34ff2743afa5f3645c (patch)
treed53085e10eadb32b9437fdce485f7199d25a7d04
parent2922ef7b7c5fcb1ddf88597acdcfe56b3e62a85f (diff)
downloadcommon-1708a8506cbb58eac2d6fc34ff2743afa5f3645c.zip
common-1708a8506cbb58eac2d6fc34ff2743afa5f3645c.tar.gz
common-1708a8506cbb58eac2d6fc34ff2743afa5f3645c.tar.bz2
mm: fix wrong cpu usage information after vmap changed [1/1]
PD#SWPL-18250 Problem: After fix vmap stack error, cpu usage from top is incorrect. Solution: fix sp not right issue. Verify: ampere Change-Id: I935f98758ba6d13c608ff2cfe2428df6f552d05a Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
Diffstat
-rw-r--r--arch/arm/kernel/entry-armv.S8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 9f157e7..394082d 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -41,7 +41,15 @@
.macro irq_handler
#ifdef CONFIG_MULTI_IRQ_HANDLER
ldr r1, =handle_arch_irq
+#ifdef CONFIG_AMLOGIC_VMAP
+ .if \vmap
+ mov r0, r8
+ .else
mov r0, sp
+ .endif
+#else
+ mov r0, sp
+#endif
badr lr, 9997f
ldr pc, [r1]
#else