From patchwork Wed Jun 28 09:25:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 113745 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8795778vqr; Wed, 28 Jun 2023 02:49:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5rMsVvw+EOUJkY06G9KPD3i2r1aFQtjFEQEXdMM7fV59IOAQk7PP15DQPTYEi8R5/kGjkj X-Received: by 2002:a17:902:ecc6:b0:1ae:1364:6086 with SMTP id a6-20020a170902ecc600b001ae13646086mr41914148plh.2.1687945794497; Wed, 28 Jun 2023 02:49:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687945794; cv=none; d=google.com; s=arc-20160816; b=lm2fPQtRHLBlt6pq4F7a4kjxH3EVCJNUOBeP1MougSZX9w9eh8mo+Tpio7PHHp8DXa YThQuodsEzhHfMCnLtFNLq2+iQMoZPlgQmN/KRzrd+Scw+9s+44iRlXi2GGsPvVkesLh OnCMZLVkawmNt/nvVhDGCJA+cm+4Mf0vFfNG3gLvMMsMdr9RMKliN1YJYCjPRedv8ZDS oqQyuPBkLeJ3DCZCXi5TcJqeveDhZQJzdZntawAB3aMcmn7cYQCTxH6Ba4nFMr+KFTjw 9JrOSAVlVMxNk/O/xi0avaI5Tz8o6mtP4vooQnOYvzDT/6XHPgBQiX0EeKlUFzxSPqRH 8g2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=OnY1F7yX7rrK4j9xMOZ9K3sCE9M5bOJmvrjoSo9v6Fo=; fh=llsnWZQnjwUPoc4vHBWKq3tHU8n0cCKpFX+675KUgu0=; b=wMc2bxAJ6cYAc1HiRW8Y2XU4LYAyS9Nvj/jjuWsnpglmANN9pnpwCLpvjxt06taQf6 wA7VpRJLnULAurot0K2/9jWhSf2H59Ojmby/IPgK/GFj55Jw4UWsVn21owuW1XBaS3lY f02GUbAQlvhJFfnlivjmWK/AgklVObkA7cN3gIGchO91xCiABunHNj8TflBNmA/cUWyB k4xJ+HwgJVPoQhR2FG5S8rQEN3EvQFHw0YtrRm4+b33GBYDwiXk6ysZO8WBTyyh73gxP kizdc9Baopj5B6tfoummkC37wqRoISoJzvFWRIo1EdEOQfcjuTQc+4qfs3HWqoo82t1j /Eww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=bAGn807W; dkim=neutral (no key) header.i=@linutronix.de header.b="R/jzqjkI"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w4-20020a170902d70400b001b06e17610fsi6656371ply.321.2023.06.28.02.49.42; Wed, 28 Jun 2023 02:49:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=bAGn807W; dkim=neutral (no key) header.i=@linutronix.de header.b="R/jzqjkI"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233183AbjF1JbR (ORCPT + 99 others); Wed, 28 Jun 2023 05:31:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229719AbjF1JZd (ORCPT ); Wed, 28 Jun 2023 05:25:33 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 272EF2D78; Wed, 28 Jun 2023 02:25:23 -0700 (PDT) Date: Wed, 28 Jun 2023 09:25:19 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1687944320; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OnY1F7yX7rrK4j9xMOZ9K3sCE9M5bOJmvrjoSo9v6Fo=; b=bAGn807W54K4kJSM53DgYfa0ZEeVO3CqePQShk7uyfpyRUzS85N7YhGQxwi+niazPYqQzb XCOB5P3LZgNLtJL/RV1yLh5YMwKQ/WZkiWF2jcL/kE/vizfYCoDhJMLY1f20BzTwSV0n/1 TGidNV1kYLFPjPlUxwS3Dh/6xOJFKX0IfsBet8ns/zPC1IrkXi68KtCXs/shVmey7wqPsn XuhPKODWX53eCKJLVSB5Mh36wx+9SFTGMnyjyKmeoKAQTiro8wWO5/EBYR+CxLUJDWtWg5 8o6QRGK1QtOfU571Vr4zjxQeYLWAf9xqgDsFpoBnK/LcEtv6jNLu6wimyF/eEg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1687944320; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OnY1F7yX7rrK4j9xMOZ9K3sCE9M5bOJmvrjoSo9v6Fo=; b=R/jzqjkI1KmfosKVLjX7mV47vM5Yw6aayY/Ux8Gx5nV2P2TCmytW6tVYjlGjWVADvJ1X3c FiVBqdrr9DShBbDA== From: "tip-bot2 for Ingo Molnar" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/urgent] objtool: Remove btrfs_assertfail() from the noreturn exceptions list Cc: David Sterba , Josh Poimboeuf , Linus Torvalds , Peter Zijlstra , linux-kernel@vger.kernel.org, Ingo Molnar , x86@kernel.org MIME-Version: 1.0 Message-ID: <168794431960.404.13615748804101554026.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769939449088168676?= X-GMAIL-MSGID: =?utf-8?q?1769939449088168676?= The following commit has been merged into the objtool/urgent branch of tip: Commit-ID: cc592643a3ea1b2231628fb414dee203633a11c0 Gitweb: https://git.kernel.org/tip/cc592643a3ea1b2231628fb414dee203633a11c0 Author: Ingo Molnar AuthorDate: Wed, 28 Jun 2023 11:16:03 +02:00 Committer: Ingo Molnar CommitterDate: Wed, 28 Jun 2023 11:21:50 +02:00 objtool: Remove btrfs_assertfail() from the noreturn exceptions list Upstream merge commit: 6f612579be9d Merge tag 'objtool-core-2023-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ... generated a (minor) semantic conflict that was not resolved: the btrfs_assertfail() entry that was removed from the list in tools/objtool/check.c in: b831306b3b7d ("btrfs: print assertion failure report and stack trace from the same line") ... because btrfs_assertfail() was changed from a noreturn function into a macro. But the list was moved to a different file, in a different enumeration format: 6245ce4ab670 ("objtool: Move noreturn function list to separate file") And has to be removed from tools/objtool/noreturns.h post-merge as well. Do it explicitly. Cc: David Sterba Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar --- tools/objtool/noreturns.h | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/objtool/noreturns.h b/tools/objtool/noreturns.h index 1514e84..e45c7cb 100644 --- a/tools/objtool/noreturns.h +++ b/tools/objtool/noreturns.h @@ -14,7 +14,6 @@ NORETURN(__stack_chk_fail) NORETURN(__ubsan_handle_builtin_unreachable) NORETURN(arch_call_rest_init) NORETURN(arch_cpu_idle_dead) -NORETURN(btrfs_assertfail) NORETURN(cpu_bringup_and_idle) NORETURN(cpu_startup_entry) NORETURN(do_exit)