From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77276C18E5A for ; Tue, 10 Mar 2020 13:31:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 46C572467D for ; Tue, 10 Mar 2020 13:31:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583847072; bh=zC3Y1C8HwIOEPRo15lvjJ/967zThZkg6I7D9cZHzu88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1ynGqqkaESx0nlyhBumvhpG/FDtvKi+U/daexM47XbOPMrtHz54IDvE8PWuKUXktj 6hqa+8Zu307tkG6eXImyChhFNkDGSk9uZodoZ6uD09jP0NkyFntT/qRoJk7L6e5++/ 4YMATuyLGkBra/iz/rxInud5A/viRcMG3wDHXosI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728116AbgCJMuL (ORCPT ); Tue, 10 Mar 2020 08:50:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:54686 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728549AbgCJMuI (ORCPT ); Tue, 10 Mar 2020 08:50:08 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 73E222468E; Tue, 10 Mar 2020 12:50:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583844607; bh=zC3Y1C8HwIOEPRo15lvjJ/967zThZkg6I7D9cZHzu88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sh/BYcvi5f+LWoMzXm3z1lAkkghh6YUmZ9oJEykInhEc5PxJkhYr7gkA7vTO9nhD9 eZv6J+EQ8oekxvRDwX52FsXtQJfPzUecm55gfd2zvj1wxDuEASBEWFqEn7kZSNPFVj g4uykD5OiiHVkJ0awVD07/9RfjMuWw4IOdH6W/tE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guo Ren , Sasha Levin Subject: [PATCH 5.4 053/168] csky: Fixup ftrace modify panic Date: Tue, 10 Mar 2020 13:38:19 +0100 Message-Id: <20200310123640.710173049@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310123635.322799692@linuxfoundation.org> References: <20200310123635.322799692@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Guo Ren [ 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 Signed-off-by: Sasha Levin --- 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