| From 165f08fdee9f4a0041dbf3e04daba98d6d46f8f7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 2 Feb 2020 09:58:42 +0800 |
| Subject: csky: Fixup ftrace modify panic |
| |
| From: Guo Ren <guoren@linux.alibaba.com> |
| |
| [ Upstream commit 359ae00d12589c31cf103894d0f32588d523ca83 ] |
| |
| During ftrace init, linux will replace all function prologues |
| (call_mcout) with nops, but it need flush_dcache and |
| invalidate_icache to make it work. So flush_cache functions |
| couldn't be nested called by ftrace framework. |
| |
| Signed-off-by: Guo Ren <guoren@linux.alibaba.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/csky/mm/Makefile | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/arch/csky/mm/Makefile b/arch/csky/mm/Makefile |
| index c94ef64810986..efb7ebab342b3 100644 |
| --- a/arch/csky/mm/Makefile |
| +++ b/arch/csky/mm/Makefile |
| @@ -1,8 +1,10 @@ |
| # SPDX-License-Identifier: GPL-2.0-only |
| ifeq ($(CONFIG_CPU_HAS_CACHEV2),y) |
| obj-y += cachev2.o |
| +CFLAGS_REMOVE_cachev2.o = $(CC_FLAGS_FTRACE) |
| else |
| obj-y += cachev1.o |
| +CFLAGS_REMOVE_cachev1.o = $(CC_FLAGS_FTRACE) |
| endif |
| |
| obj-y += dma-mapping.o |
| -- |
| 2.20.1 |
| |
