From patchwork Tue Aug 17 16:27:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1517766 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=LFsX9rmS; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GpxJy3CYVz9sVq; Wed, 18 Aug 2021 02:27:46 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mG1wF-0003vO-Ff; Tue, 17 Aug 2021 16:27:43 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mG1wA-0003ut-IY for kernel-team@lists.ubuntu.com; Tue, 17 Aug 2021 16:27:38 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 686EA3F339 for ; Tue, 17 Aug 2021 16:27:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1629217658; bh=fb4uAqIj9vvti5i3HkxNM1nAkCBEYLxwDLnieiGrUug=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LFsX9rmSfKGXou160Ou0vXMaswATql2GZreT13F5dqONRw/ZHV+qtqjuJnTLI7gRi HAWuA+NNzkOMxa2fKl6DdWuTh8Ur8gEcgXpiRBiHeCA6S3Pts1mjEYnqypvAZMc6Zm MYXWaqK8Aeqk5mPPenxVR+iawUh1FngR654HbWW9TcjbkpIk+SZKEnFCSuRaUkoacj 5T89Z2TuiuKB5f0aod7nUYQSQc4tE49uP2SCud/96ir3PBrOvgziPdOg3sSkTrGCOs uVGU3MBptMvNpTYvOEJp8qp5N6z0ELbzlTGt9jxuJW9j2yqIMsb8i+i5y45zzsZaYZ ij4kZByoYzm2w== Received: by mail-pj1-f71.google.com with SMTP id j14-20020a17090a318e00b001796382f0caso7656095pjb.5 for ; Tue, 17 Aug 2021 09:27:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fb4uAqIj9vvti5i3HkxNM1nAkCBEYLxwDLnieiGrUug=; b=ULuo6l38IRKs7T4zMVLQJkeRkmi/B4GYeVTj9ir6pa9ek+2XCr8mJ3Z8Kaj8zd4twx V2QwyfIQpSDGy211rXubju+Xv7xxW1qStborAEhe+SwXg0wbuioWCso3AyUbgzRxVh04 8pkdQw8k+4fHNXGpDUWyColX3m99wwWgJ6oHvdeMj0IwWt3NBYfWuIKVfZ1DA835vdvO y4ZR2flk2bzdZijoYEvg19ARtenBKSKiiSaJtyUrKZYR46eIHjF2jjVoHM3Xm+cvmLKb Lg9rlbVaQf5szRjdsbzugvzLeGzE9HnGBEIf9MrTKwM+IuE2b6UEFU7tx6ph1oFJGnf7 z2wg== X-Gm-Message-State: AOAM531+EpD3pugBvGUET1Z96yoDW0/QQ/X5lx4pI79nQoVH7e/isTsd d9ck1eiozpqDa59HrG2nf+fVi1QXVteUtXV3RwcgVW/AC5I3UhRFLWouzHMSKTaIkBhJ5RU5/PC odTWcoqH/LzDZG+LhxFEsNP3Hi3iE3NjFKO7nIJSotQ== X-Received: by 2002:a17:90a:a382:: with SMTP id x2mr4522536pjp.86.1629217656879; Tue, 17 Aug 2021 09:27:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvpCKCloEucBkYyWOU/SZ7kVCxocjuJ/k2xwBPVJoKehpDUedWo6rHLshfKn9U7I8uJVHrrQ== X-Received: by 2002:a17:90a:a382:: with SMTP id x2mr4522478pjp.86.1629217656153; Tue, 17 Aug 2021 09:27:36 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:a595:a19f:5b88:1e93]) by smtp.gmail.com with ESMTPSA id x4sm3347957pfc.191.2021.08.17.09.27.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Aug 2021 09:27:35 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [HIRSUTE][linux-riscv][PATCH 1/3] riscv: Fixup wrong ftrace remove cflag Date: Tue, 17 Aug 2021 17:27:18 +0100 Message-Id: <20210817162720.126460-2-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210817162720.126460-1-dimitri.ledkov@canonical.com> References: <20210817162720.126460-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cascardo@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Guo Ren We must use $(CC_FLAGS_FTRACE) instead of directly using -pg. It will cause -fpatchable-function-entry error. Signed-off-by: Guo Ren Signed-off-by: Palmer Dabbelt (cherry picked from commit 67d945778099b14324811fe67c5aff2cda7a7ad5) Signed-off-by: Dimitri John Ledkov --- arch/riscv/kernel/Makefile | 4 ++-- arch/riscv/mm/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index f6caf4d9ca..22c66dde18 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -4,8 +4,8 @@ # ifdef CONFIG_FTRACE -CFLAGS_REMOVE_ftrace.o = -pg -CFLAGS_REMOVE_patch.o = -pg +CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE) +CFLAGS_REMOVE_patch.o = $(CC_FLAGS_FTRACE) endif extra-y += head.o diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile index c0185e556c..6b4b7ec1bd 100644 --- a/arch/riscv/mm/Makefile +++ b/arch/riscv/mm/Makefile @@ -2,7 +2,7 @@ CFLAGS_init.o := -mcmodel=medany ifdef CONFIG_FTRACE -CFLAGS_REMOVE_init.o = -pg +CFLAGS_REMOVE_init.o = $(CC_FLAGS_FTRACE) endif KCOV_INSTRUMENT_init.o := n