From nobody Sat Apr 18 14:17:10 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72F61C433EF for ; Wed, 13 Jul 2022 09:50:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235264AbiGMJu4 (ORCPT ); Wed, 13 Jul 2022 05:50:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230348AbiGMJux (ORCPT ); Wed, 13 Jul 2022 05:50:53 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DCBEF6837 for ; Wed, 13 Jul 2022 02:50:52 -0700 (PDT) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id D185B33AB2; Wed, 13 Jul 2022 09:50:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1657705850; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1cLqF9b/idfjjmBVHpl66HKFXX47ckAo/g2nKjU6yJY=; b=EBbFm7h3uKOXK69EOLNZqpXjpToKxOCRB6kQduEM5m8GB2NJx7PV8hTqiLNO41OeBGbb+U WOmDRxbcv4Wm+h/MAh4aZE+nLTl+3i7j+pvsP19ZRvN057HZW5Y98/uKxGg43YwyDeaaLm nZWqb3mVj3MB6xSjyqUDrdArvC6E6AY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1657705850; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1cLqF9b/idfjjmBVHpl66HKFXX47ckAo/g2nKjU6yJY=; b=6piFxlNhqABKztsI4IU7WR+vUxnCL6LEavG0Kdc1l4Y5tX2Jowk9qkyVkq2a7L6NvV1Opv 1bvMecZTmQpp9IBg== Received: from localhost.localdomain (unknown [10.100.208.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 6FBD42C141; Wed, 13 Jul 2022 09:50:50 +0000 (UTC) From: Jiri Slaby To: bp@alien8.de Cc: dave.hansen@linux.intel.com, x86@kernel.org, linux-kernel@vger.kernel.org, Jiri Slaby , Peter Zijlstra , Borislav Petkov , Josh Poimboeuf Subject: [PATCH] x86/asm/32: fix ANNOTATE_UNRET_SAFE use on 32bit Date: Wed, 13 Jul 2022 11:50:46 +0200 Message-Id: <20220713095046.26737-1-jslaby@suse.cz> X-Mailer: git-send-email 2.37.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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: `a= nnotate_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) Cc: Peter Zijlstra (Intel) Cc: Borislav Petkov Cc: Josh Poimboeuf Signed-off-by: Jiri Slaby --- 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 eb8656bac99b..9b7acc9c7874 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 --=20 2.37.0