Received: by 2002:ac0:da4c:0:0:0:0:0 with SMTP id a12csp460010imi; Fri, 22 Jul 2022 02:52:44 -0700 (PDT) X-Google-Smtp-Source: AGRyM1svqO+sGPJXcxXkc3orlcAYSs9ueF5UdcbI84eDoHzmNOt0SMTb0A4SO2vGG8UNf1vcrvyM X-Received: by 2002:a63:ea05:0:b0:411:f94f:b80f with SMTP id c5-20020a63ea05000000b00411f94fb80fmr2416066pgi.189.1658483564715; Fri, 22 Jul 2022 02:52:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658483564; cv=none; d=google.com; s=arc-20160816; b=e3rjvdP2/IR97ZorQSNPIrNSOAzL6fwLWo65G03fyX5V2aS/VGCVPWnRtrU7F9V3NF 8jQa5AIsbhXUgwwqYZtEtEq30KIjVV43QUkJMWg7NDWqRSV3vJgXdTdfqXKLWE+9YKgF Bm1MpPJuaq/D+HqYCR1wN3q4mLSlYITk1GpuxMIYcsUHVlTLI5AG+LtoJMlzXvnBLloR igVHJBP+ZyBuwk34R2begmKpXafk1d7xvcKDY0crCwqkqijdPdfSqS5Nlz6JHeytZLv3 thdG1MKsqknCevX+2fti42NrmEtUeQh0ke3JGOjRwhMg5D+hySABfvqoSliLz8paKY3p pqcg== 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=HT56D2Fr5c3w3WyNYO5QfvmEdfSg2PHGbrPJWp0bK2ZS24z9op+NaTY03LBVxjxvsZ XvtuNsM2ZyuIvrtbtef+WL7egGe3l+U4nmmaYhytT7U9qDqWwnKkfIeNaeUl8YWo4KJj puQb36Od5TzpXhNu2sb4vlqDmLC4RVswv7HccLkTHEs4qxK0bX8FsEJgvKr924C/eREi 8GklaSmpuDCEsgDjt7YgFggnON/FXv9J3b05B51vNNN0yiIGfOA1zbwcKJfH1/TjPjk0 Qcqku4JynIqjM8LdjeIqrMkLAswpWcqmZ1FQJ3x+wC15XbVA0VJQr/7N7gxfSMJenR85 +qvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=z+K8Y9rU; 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 190-20020a6217c7000000b0052b206007bcsi5047719pfx.237.2022.07.22.02.52.29; Fri, 22 Jul 2022 02:52:44 -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=z+K8Y9rU; 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 S235489AbiGVJQS (ORCPT + 99 others); Fri, 22 Jul 2022 05:16:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235652AbiGVJPk (ORCPT ); Fri, 22 Jul 2022 05:15:40 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCB7BAFB5E; Fri, 22 Jul 2022 02:11: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 789B0B827B2; Fri, 22 Jul 2022 09:11:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D26B3C341D6; Fri, 22 Jul 2022 09:11:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1658481097; bh=/dc3mGi7bQmupPffWgNjejnw/63egPiFRy77Qic0Qag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z+K8Y9rUWfkOtGPcpTeiAy20gW9bw4j1Y/GceofTBpvV+tcFNDx9yEy7ug4tU4GiM e1vL+47ZaBzFPsbmO5Vg60nhPxdl/NbYS3PSRFH3Xi8nNj+nNduNOAsLnQ/exp4xPY zygS58UEZI2an4vXwflXi8mI7pL4yKXs2Dxp+t4Y= 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.18 62/70] x86/asm/32: Fix ANNOTATE_UNRET_SAFE use on 32-bit Date: Fri, 22 Jul 2022 11:07:57 +0200 Message-Id: <20220722090654.332275936@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220722090650.665513668@linuxfoundation.org> References: <20220722090650.665513668@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