]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
csky: Fixup ftrace modify panic
authorGuo Ren <guoren@linux.alibaba.com>
Sun, 2 Feb 2020 01:58:42 +0000 (09:58 +0800)
committerPaolo Pisati <paolo.pisati@canonical.com>
Fri, 13 Mar 2020 12:26:53 +0000 (13:26 +0100)
BugLink: https://bugs.launchpad.net/bugs/1867178
[ 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>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
arch/csky/mm/Makefile

index c94ef648109865e5662edeb1a61c9685426340fa..efb7ebab342b397a1d671ab23090a73138538be9 100644 (file)
@@ -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