Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp558768imw; Wed, 13 Jul 2022 03:55:19 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tGqYaTRttJdc+baxBuY1HNTHfltOQXwMPKHF7bMRm1WmStpfU9NC3Fycn0XhVFaYYnxD2b X-Received: by 2002:a17:903:1111:b0:16a:acf4:e951 with SMTP id n17-20020a170903111100b0016aacf4e951mr2895124plh.72.1657709719222; Wed, 13 Jul 2022 03:55:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657709719; cv=none; d=google.com; s=arc-20160816; b=oAxXoN0xg49BhbTtfnEYGOyknuCQmCMtZQ2eRFkfzVnnaHuIK81LbzFaIj+r/P+uyG lbNesCVbmteEch+wo03mPw0cvQJkl8G+q4xLVEttKhR5IG5BAqMYpMil4lEQOvB4wkYH 0cPBVoM0Jg514imfIX0R2qGk3qHfvfzRVawOdlH3t000HZV1lEiBfIOSIOgANNaX9Y8K pbNp86mPGZxFhEMFBqXx6G2KgoGwG11eNh7CFVdhKTLHAvyccAP6PgEGyx90BTx2r0zX o8354fP420F/LRwaWx/2zGcLnuLrmLkrNUo2o/emTkmHTQ/JbszbeLIGPkwaGC2lhMpg LUlQ== 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=psh6WM6tuF479vJvLIQ+GBcKmgj2tpGcGifVisQx9RM=; b=m3suvsN0Ys5iTgpgKGQByfdhBzrRpPLOmYpYmmStH4qGmHtjrZckpgLSoQyW9rImuq k+PlgHhnUk1MZ+jL+sCq+5TrJj5Ae0iQdeuFTJ2HXAWmf+TjxGoC972Kv/LtkqqspcNp 1D9oNFfH60547gv6Iy9lU130TzzOW41VWjvUjmns3Jo7DQGTxA1Cc/f3ZqbzEkEKiDiA Cj+FascfhzuJCj2wMPKBI1le3Ftt2hxFcO3VN0zEZaGYR9IWEmhewCvuRLOIFUxnYiOt /wt5XVmiVMzl177b+J2E8hihhLap8juIYB3xYOJxNV/uLly4Xas112Hydmu07xDfBJX+ sXvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ge7Hjf2Q; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y17-20020a170902cad100b0016bd75f8780si13583247pld.117.2022.07.13.03.55.05; Wed, 13 Jul 2022 03:55:19 -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=ge7Hjf2Q; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 S235001AbiGMKwR (ORCPT + 99 others); Wed, 13 Jul 2022 06:52:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229941AbiGMKwO (ORCPT ); Wed, 13 Jul 2022 06:52:14 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0124F90D3; Wed, 13 Jul 2022 03:52:13 -0700 (PDT) Date: Wed, 13 Jul 2022 10:52:11 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1657709532; 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=psh6WM6tuF479vJvLIQ+GBcKmgj2tpGcGifVisQx9RM=; b=ge7Hjf2Q4VKtmOZsF5kwDB2S4Ld/hAMOBxwMZJbjc6/VtDyGebDmom4BpFlyKTfnRMGSTM 7Mpw3YePqTJ6rTGglo/aftW5ES0xyEeBli9LJBqgZiD4tVGXKFQarQylkLlrN1GVADmNTI 3kYuS+VwqrLm/NBcpzqfY9NdyMdSTK0ZB4pm7G4ooIwUk484xIsurGrJ8vlDA7HMxVh/zx 8F/6k7yETuTjObyMzZdMON1fF4gpCVvIf13LwatUFB12w0UolbmMDdWL5bboX1miHtll/w 5XSYV0gbB166/DkIzOKlYaTjDgsjrPaUTWdxKt3sQnt6q9pSXqHVWs+a3T2N3g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1657709532; 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=psh6WM6tuF479vJvLIQ+GBcKmgj2tpGcGifVisQx9RM=; b=lPoXyM5jv5J/Bkviw7MU9GNAsP5BfAqujGVk6zwujTo/F7+JlbYaLuPYbvC7yf5r6Fhq/p bA6IUKEvoZtFnVBQ== From: "tip-bot2 for Jiri Slaby" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/asm/32: Fix ANNOTATE_UNRET_SAFE use on 32-bit Cc: Jiri Slaby , Borislav Petkov , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <63e23f80-033f-f64e-7522-2816debbc367@kernel.org> References: <63e23f80-033f-f64e-7522-2816debbc367@kernel.org> MIME-Version: 1.0 Message-ID: <165770953127.15455.14007409023493265693.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 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 The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 3131ef39fb03bbde237d0b8260445898f3dfda5b Gitweb: https://git.kernel.org/tip/3131ef39fb03bbde237d0b8260445898f3dfda5b Author: Jiri Slaby AuthorDate: Wed, 13 Jul 2022 11:50:46 +02:00 Committer: Borislav Petkov CommitterDate: Wed, 13 Jul 2022 12:43:26 +02:00 x86/asm/32: Fix ANNOTATE_UNRET_SAFE use on 32-bit The build on x86_32 currently fails after commit 9bb2ec608a20 (objtool: Update Retpoline validation) with: arch/x86/kernel/../../x86/xen/xen-head.S:35: Error: no such instruction: `annotate_unret_safe' ANNOTATE_UNRET_SAFE is defined in nospec-branch.h. And head_32.S is missing this include. Fix this. Fixes: 9bb2ec608a20 ("objtool: Update Retpoline validation") Signed-off-by: Jiri Slaby Signed-off-by: Borislav Petkov Link: https://lore.kernel.org/r/63e23f80-033f-f64e-7522-2816debbc367@kernel.org --- arch/x86/kernel/head_32.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index eb8656b..9b7acc9 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include