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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33ABEC77B7D for ; Sat, 13 May 2023 06:37:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231325AbjEMGhv (ORCPT ); Sat, 13 May 2023 02:37:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229527AbjEMGhu (ORCPT ); Sat, 13 May 2023 02:37:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB0C72D48 for ; Fri, 12 May 2023 23:37:49 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 80270617E7 for ; Sat, 13 May 2023 06:37:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10835C433EF; Sat, 13 May 2023 06:37:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1683959868; bh=wI2VIx4+NM+Igkn17D1Y9O4IiqhY/Ke/FNFC7s+21Ug=; h=Subject:To:Cc:From:Date:From; b=uN/FjlJUAGWghQE4nR2R8ftryvEgrLZTQwWwBnxc3dy37LLCaginmnPiuuiHWr8F1 jSO5ueZQ4mo/Z64Uv0WnodUZvhcGrJsYpZCsLZ/q8TCoNgA5ttGvcPlMmONbbxLLRg UqAUuRN11a244+Txlp496APFs7lKqXrVlrNt+baQ= Subject: FAILED: patch "[PATCH] sh: mcount.S: fix build error when PRINTK is not enabled" failed to apply to 4.19-stable tree To: rdunlap@infradead.org, dalias@libc.org, geert@linux-m68k.org, glaubitz@physik.fu-berlin.de, ysato@users.sourceforge.jp Cc: From: Date: Sat, 13 May 2023 15:37:31 +0900 Message-ID: <2023051330-unused-wrongness-eefc@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y git checkout FETCH_HEAD git cherry-pick -x c2bd1e18c6f85c0027da2e5e7753b9bfd9f8e6dc # git commit -s git send-email --to '' --in-reply-to '2023051330-unused-wrongness-eefc@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: c2bd1e18c6f8 ("sh: mcount.S: fix build error when PRINTK is not enabled") 37744feebc08 ("sh: remove sh5 support") 62d0fd591db1 ("arch: split MODULE_ARCH_VERMAGIC definitions out to ") 630f289b7114 ("asm-generic: make more kernel-space headers mandatory") a8222fd5b80c ("Merge tag 'microblaze-v5.7-rc1' of git://git.monstr.eu/linux-2.6-microblaze") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From c2bd1e18c6f85c0027da2e5e7753b9bfd9f8e6dc Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Sun, 5 Mar 2023 20:00:37 -0800 Subject: [PATCH] sh: mcount.S: fix build error when PRINTK is not enabled Fix a build error in mcount.S when CONFIG_PRINTK is not enabled. Fixes this build error: sh2-linux-ld: arch/sh/lib/mcount.o: in function `stack_panic': (.text+0xec): undefined reference to `dump_stack' Fixes: e460ab27b6c3 ("sh: Fix up stack overflow check with ftrace disabled.") Signed-off-by: Randy Dunlap Cc: John Paul Adrian Glaubitz Cc: Yoshinori Sato Cc: Rich Felker Suggested-by: Geert Uytterhoeven Cc: stable@vger.kernel.org Reviewed-by: John Paul Adrian Glaubitz Link: https://lore.kernel.org/r/20230306040037.20350-8-rdunlap@infradead.org Signed-off-by: John Paul Adrian Glaubitz diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug index 10290e5c1f43..c449e7c1b20f 100644 --- a/arch/sh/Kconfig.debug +++ b/arch/sh/Kconfig.debug @@ -15,7 +15,7 @@ config SH_STANDARD_BIOS config STACK_DEBUG bool "Check for stack overflows" - depends on DEBUG_KERNEL + depends on DEBUG_KERNEL && PRINTK help This option will cause messages to be printed if free stack space drops below a certain limit. Saying Y here will add overhead to