Received: by 2002:ac0:da4c:0:0:0:0:0 with SMTP id a12csp458400imi; Fri, 22 Jul 2022 02:50:16 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vTvEsZe4YAKyI4pB1jrXrW1w2tIyvsXbr4F3v+XN+AM68yXTt8XTDtAoJ2yqDeqseqEUtF X-Received: by 2002:a63:164d:0:b0:416:4bc:1c28 with SMTP id 13-20020a63164d000000b0041604bc1c28mr2483330pgw.302.1658483415804; Fri, 22 Jul 2022 02:50:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658483415; cv=none; d=google.com; s=arc-20160816; b=F7ZirjGehnTa1T4hHciT2CQhxDYQ58kmwbBywztmPeF9Q23dP+YuQPVppOrbDusxfk 3Rx2tfPxV5aDnKpZC/j67Pwx8Z1ey90crdSLddUd53AHRID68mKouI1y5pzoqOfPjKi1 bP7suBXLLWDmRuzUGVRPzIvOEJgPsTeKJ4bWRxMh1cAvpMkxHBuRag5ouAoljZrtVouI /TADfT2O6dnOArYqIwbYbbJHIzI9fo0RCoynRm4izmfAXRg4T9z7RCuUS28d0RtUtqlP 6WXBrD5V5mp+kvSdv53tSbWXnU7Dr+busxyHEqGZnviJ+A2rH+9aWwlct3ur0QZtWnJn TLLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IrY1js+43CrjItfFYBVbvzfkFnkp+HYrJL8FWrxTxcI=; b=ZIouCotZYfoVLk3bPzvWdbtGMYEaEVZHra/KRk+PMooSPl81BPftQ8QPv9f6VtmITk D19Cc5QkvdVQ6+MJZcf8q5r/g2ZAi3zy+OozcXh6CGSVhBoCn7rZk1cWQQceTOz1DVCo W2tuPFpa+PEZLpff9bGynKEA2sFWHm76aOXvfHcntYl/G45EJruxZPLxoEDbq/3/pSgc FHtAEJLlYfwkxsqza2RzXygTTPRbqkPmdK3xLwE3NgmHj30MNhUdf4BeH/rGlYlSdjEi z1XDqsIS4X+2knBQAJ/wn2zYeUeBdfJrG3LGlbHpm1MTofXu7UBAQFW9U9m8Xqv7Gi3K uB5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2YiCPFBj; 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=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n22-20020a056a0007d600b0052b93453af1si5115148pfu.92.2022.07.22.02.50.00; Fri, 22 Jul 2022 02:50:15 -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=@linuxfoundation.org header.s=korg header.b=2YiCPFBj; 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=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235605AbiGVJ2m (ORCPT + 99 others); Fri, 22 Jul 2022 05:28:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236471AbiGVJ2H (ORCPT ); Fri, 22 Jul 2022 05:28:07 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38901B5C90; Fri, 22 Jul 2022 02:17:39 -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 ams.source.kernel.org (Postfix) with ESMTPS id C1A6EB827BE; Fri, 22 Jul 2022 09:17:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1E3DC341C6; Fri, 22 Jul 2022 09:17:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1658481456; bh=/dc3mGi7bQmupPffWgNjejnw/63egPiFRy77Qic0Qag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2YiCPFBjMFqfNBWCyvbXkJXNUXpTkmqZYFJ/P8oe5y9taN/ZSfBYIP6KGwRdv8i42 qpr1008iLasKg3lsJ/K+KsthaGOUZNDQHtt2rco0nc4DTzC+PPt9/fW22Papx4PLYN mimkdiAbWcn1Ts1pOyphUdiYSG2gch1XXboTIh2w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Slaby , Borislav Petkov Subject: [PATCH 5.15 80/89] x86/asm/32: Fix ANNOTATE_UNRET_SAFE use on 32-bit Date: Fri, 22 Jul 2022 11:11:54 +0200 Message-Id: <20220722091137.818560555@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220722091133.320803732@linuxfoundation.org> References: <20220722091133.320803732@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 From: Jiri Slaby commit 3131ef39fb03bbde237d0b8260445898f3dfda5b upstream. 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 Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/head_32.S | 1 + 1 file changed, 1 insertion(+) --- 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