diff mbox series

[5.10,078/103] riscv: Fixup wrong ftrace remove cflag

Message ID	20210901122303.180582648@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Guo Ren <guoren@linux.alibaba.com>, Palmer Dabbelt <palmerdabbelt@google.com>, Dimitri John Ledkov <dimitri.ledkov@canonical.com> Subject: [PATCH 5.10 078/103] riscv: Fixup wrong ftrace remove cflag Date: Wed, 1 Sep 2021 14:28:28 +0200 Message-Id: <20210901122303.180582648@linuxfoundation.org> In-Reply-To: <20210901122300.503008474@linuxfoundation.org> References: <20210901122300.503008474@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.10,002/103] bpf: Fix ringbuf helper function compatibility [5.10,004/103] ASoC: rt5682: Adjust headset volume button threshold [5.10,005/103] ASoC: component: Remove misplaced prefix handling in pin control functions [5.10,006/103] ARC: Fix CONFIG_STACKDEPOT [5.10,008/103] once: Fix panic when module unload [5.10,011/103] net: mscc: Fix non-GPL export of regmap APIs [5.10,012/103] can: usb: esd_usb2: esd_usb2_rx_event(): fix the interchange of the CAN RX and TX ... [5.10,015/103] Revert "btrfs: compression: dont try to compress if we dont have enough pages" [5.10,017/103] Revert "USB: serial: ch341: fix character loss at high transfer rates" [5.10,019/103] usb: renesas-xhci: Prefer firmware loading on unknown ROM state [5.10,022/103] scsi: core: Fix hang of freezing queue between blocking and running device [5.10,025/103] RDMA/bnxt_re: Remove unpaired rtnl unlock in bnxt_re_dev_init() [5.10,026/103] ice: do not abort devlink info if board identifier cant be found [5.10,027/103] net: usb: pegasus: fixes of set_register(s) return value evaluation; [5.10,028/103] igc: fix page fault when thunderbolt is unplugged [5.10,029/103] igc: Use num_tx_queues when iterating over tx_ring queue [5.10,033/103] ip_gre: add validation for csum_start [5.10,035/103] net: marvell: fix MVNETA_TX_IN_PRGRS bit number [5.10,037/103] net/sched: ets: fix crash when flipping from strict to quantum [5.10,040/103] cxgb4: dont touch blocked freelist bitmap after free [5.10,041/103] rtnetlink: Return correct error on changing device netns [5.10,046/103] Revert "mmc: sdhci-iproc: Set SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN on BCM2711" [5.10,047/103] net: stmmac: add mutex lock to protect est parameters [5.10,048/103] net: stmmac: fix kernel panic due to NULL pointer dereference of plat->est [5.10,049/103] drm/i915: Fix syncmap memory leak [5.10,050/103] usb: gadget: u_audio: fix race condition on endpoint stop [5.10,051/103] dt-bindings: sifive-l2-cache: Fix select matching [5.10,055/103] opp: remove WARN when no valid OPPs remain [5.10,056/103] cpufreq: blocklist Qualcomm sm8150 in cpufreq-dt-platdev [5.10,057/103] virtio: Improve vq->broken access to avoid any compiler optimization [5.10,059/103] virtio_vdpa: reject invalid vq indices [5.10,060/103] vringh: Use wiov->used to check for read/write desc order [5.10,061/103] tools/virtio: fix build [5.10,062/103] qed: qed ll2 race condition fixes [5.10,063/103] qed: Fix null-pointer dereference in qed_rdma_create_qp() [5.10,065/103] drm/amd/pm: change the workload type for some cards [5.10,067/103] drm: Copy drm_wait_vblank to user before returning [5.10,069/103] drm/nouveau/kms/nv50: workaround EFI GOP window channel format differences [5.10,072/103] pipe: avoid unnecessary EPOLLET wakeups under normal loads [5.10,076/103] vt_kdsetmode: extend console locking [5.10,077/103] Bluetooth: btusb: check conditions before enabling USB ALT 3 for WBS [5.10,078/103] riscv: Fixup wrong ftrace remove cflag [5.10,082/103] perf record: Fix memory leak in vDSO found using ASAN [5.10,083/103] perf tools: Fix arm64 build error with gcc-11 [5.10,084/103] perf annotate: Fix jump parsing for C++ code. [5.10,085/103] powerpc/perf: Invoke per-CPU variable access with disabled interrupts [5.10,088/103] srcu: Provide internal interface to start a Tiny SRCU grace period [5.10,090/103] srcu: Provide polling interfaces for Tiny SRCU grace periods [5.10,093/103] usb: typec: ucsi: Work around PPM losing change information [5.10,094/103] usb: typec: ucsi: Clear pending after acking connector change [5.10,095/103] net: dsa: mt7530: fix VLAN traffic leaks again [5.10,099/103] kthread: Fix PF_KTHREAD vs to_kthread() race [5.10,100/103] Revert "floppy: reintroduce O_NDELAY fix" [5.10,101/103] Revert "parisc: Add assembly implementations for memset, strlen, strcpy, strncpy a...

Commit Message

Greg KH Sept. 1, 2021, 12:28 p.m. UTC

From: Guo Ren <guoren@linux.alibaba.com>

commit 67d945778099b14324811fe67c5aff2cda7a7ad5 upstream.

We must use $(CC_FLAGS_FTRACE) instead of directly using -pg. It
will cause -fpatchable-function-entry error.

Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 arch/riscv/kernel/Makefile |    4 ++--
 arch/riscv/mm/Makefile     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff mbox series

Patch

--- 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
--- 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