From patchwork Mon Oct 17 14:54:22 2022 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: 3548 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1494679wrs; Mon, 17 Oct 2022 07:59:34 -0700 (PDT) X-Google-Smtp-Source: AMsMyM78pIpaiDmgu7qccuJikkY3KTUFuUSQhH3kGauFCazpUgzmYYUWmDSbYDcVJpTaVFMNI3jP X-Received: by 2002:a17:903:2c9:b0:182:c500:d93d with SMTP id s9-20020a17090302c900b00182c500d93dmr12618195plk.44.1666018773894; Mon, 17 Oct 2022 07:59:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666018773; cv=none; d=google.com; s=arc-20160816; b=OsHgbcG8cwut/mXVzLp2GM1DxX5vsHt4s3fCGh5lCamcrYiKI5X8rRDjNwL56LN2OL ZxU63zANOx1FqEYtO/xucgzux2RuWzp3Pj9wJa+o82qlF9aqd0EOxV23EhE609p3m65z XH3Pslp4Eb7YOM7FWtWB0P53Su++p3ZSXLzjZoF3DJ1k9LVV8i9R//Q3lKG5fnY5ECXi fmp1vInObvvlwTaG3ZyPauNkuQS1RrbEzfevTs/dtQCF2KiAeAZ54t1HIZAiZ08AIB7P GVgjfPN0jQUUpduIcP7O30VV+DAu2DncPyoG5c/mxqG+9f3dJwa2IUEjYDRoYCDRhTiV FVaQ== 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:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=HHE5BUe4f/3zSTaUPJQMMr/NoAiSUzmhhG4WIp8BV+Q=; b=SOS7lGqELV3WPhCAFTQdNr8KXb3hGeeRiIK6zYkT2D90LWHas/qfnHjMUxAGPObjiK d88vRKodEBZDgPBbbCWglbwBj5JFSYUqK86QIaHnWMqqqjKOPFim9KxF5MAj+ULicWNQ h7emyzInHPGWwDJcxVr2tP2uyLWGgTf/4vrXKF1+cTvkfo13vkq9yztZJaJUEr6H8tKR SBjoqyaSt2f+2fDu9Ty7EYeXnt/fmwIXkQgvJ+ROeWlWtJ7PT9A0m4WVlbWYVUZClsUI fpGMLWirXLLunQU72RNOf6g0wOH+ZtJ4/7Smg4qv/e7mtyvOylrFyXtrBNUABkMMlmhH NPmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=R8ttylc2; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=xElgjLGE; 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 u185-20020a6385c2000000b0045f976cee92si11148546pgd.676.2022.10.17.07.59.19; Mon, 17 Oct 2022 07:59:33 -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=R8ttylc2; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=xElgjLGE; 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 S231499AbiJQO7F (ORCPT + 99 others); Mon, 17 Oct 2022 10:59:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231494AbiJQO5k (ORCPT ); Mon, 17 Oct 2022 10:57:40 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B8176AE8D; Mon, 17 Oct 2022 07:55:19 -0700 (PDT) Date: Mon, 17 Oct 2022 14:54:22 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1666018463; 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: in-reply-to:in-reply-to:references:references; bh=HHE5BUe4f/3zSTaUPJQMMr/NoAiSUzmhhG4WIp8BV+Q=; b=R8ttylc2pg+g9C691l+N8T2tLKpKHB0X1Vt5kcygNHqTnkuiZg70Lli1bXw+0JZJc2yHCn nT3g92DVDuhC5q6JW+rvMRQ6Ok7vZAYZ2MjhOVjeiDmWORusmWUShnmvXNW9NdLrW+ydo/ ZYCGH8DO4oBJ2O80eCgoWPXcSaLHut+H9hkWEJSONpsN/FLuYKYpe/YuOdDPByHLxD59OI C1eEz0MMiBHZJ510NR9KoK8jzgYmIeM50RdtWZwNOKVTEzDmL5f4TlGw/aAEpXhqxVN/BQ oETrT0Qma5RU3wq/W0akgBy/VqEtlGR5D/imQP/nWT8GNnkZlK3vzUg8jhv+iA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1666018463; 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: in-reply-to:in-reply-to:references:references; bh=HHE5BUe4f/3zSTaUPJQMMr/NoAiSUzmhhG4WIp8BV+Q=; b=xElgjLGEBdfG8mkn9e1k3SEyOfaGKomhnho2IztoGQtzpkWjNO035TaWu+Z0+yE2MpwVMc gNPvX+k6iFRJhyAw== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] x86/error_inject: Align function properly Cc: "Peter Zijlstra (Intel)" , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20220915111143.930201368@infradead.org> References: <20220915111143.930201368@infradead.org> MIME-Version: 1.0 Message-ID: <166601846243.401.16360337742759626779.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 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?1746947301589185944?= X-GMAIL-MSGID: =?utf-8?q?1746947301589185944?= The following commit has been merged into the x86/core branch of tip: Commit-ID: 1934dc9a8a92fda36ab80cfd55edab1708dcdf9a Gitweb: https://git.kernel.org/tip/1934dc9a8a92fda36ab80cfd55edab1708dcdf9a Author: Peter Zijlstra AuthorDate: Thu, 15 Sep 2022 13:10:49 +02:00 Committer: Peter Zijlstra CommitterDate: Mon, 17 Oct 2022 16:40:59 +02:00 x86/error_inject: Align function properly Ensure inline asm functions are consistently aligned with compiler generated and SYM_FUNC_START*() functions. Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20220915111143.930201368@infradead.org --- arch/x86/lib/error-inject.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/lib/error-inject.c b/arch/x86/lib/error-inject.c index 1e3de07..b5a6d83 100644 --- a/arch/x86/lib/error-inject.c +++ b/arch/x86/lib/error-inject.c @@ -11,6 +11,7 @@ asm( ".text\n" ".type just_return_func, @function\n" ".globl just_return_func\n" + ASM_FUNC_ALIGN "just_return_func:\n" ANNOTATE_NOENDBR ASM_RET