Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp536303imw; Wed, 13 Jul 2022 03:25:10 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uvYLjl+EVnTfDc8M8c68DfKVCzEvwT+vV4aQhgusdPBXjL2u0HUtIgokyqXpvN8DFqZBeT X-Received: by 2002:a17:906:58c7:b0:722:f4bf:cb75 with SMTP id e7-20020a17090658c700b00722f4bfcb75mr2698782ejs.450.1657707910672; Wed, 13 Jul 2022 03:25:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657707910; cv=none; d=google.com; s=arc-20160816; b=qbFHmOVk4rJh8aKwegycK1a80Q+cL5A4BEWXtt53y3qEacqitY2pjFUDV7e5YD6eix yYeCLqnelu6MpH+w0zfX5WMfDidxtfqjHcvEVVuAh7ci7GhwkCVaMLA/5z+ZyYIuazbi hycEBJMNTnPGTrvmoR0M1vJ2DOV6sgAiAOg+JEPCjCMB4qpuGlplUBdv6EMe7nsZvPKS UHJqEQRtJclMOtw8b1Gql95v/TIw3Nfcw/c4se58u3zc+KXBBnN1OOmX03PImn4gTIaK rrtwqe9rYLwk6EbIIqGJ1uR5kUAsE2U44FYTFXrGiIwRKmRX9F3dJIp9epnT1dUuqvZn O4DA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=1cLqF9b/idfjjmBVHpl66HKFXX47ckAo/g2nKjU6yJY=; b=TPY/JZZuL95cgwKReeqE1c/2c/TV8ZwkA6DpHmNkLTw0HWvYDLzqT7M8mfsXctrfJ9 VIB1aR2bpcXl2yD3qzHNn+N0+X1fWbAYZ2YM1KKUgRCHBZV7KCkyc3tAmmI7Wej54LWb kWlh33gmedrswa+cqLwOQmeubaGw+GnHZPl5IlHIoYbT7z2seWPkyy7RtqK41s/Uz18d jJwHoY2P1DBVLZc0VSBhely2sWEeFEoJcBtqs/otlxjAkA7XOoAOpeZOsPHw1cWOBd7H zzsDQuTclqovyY08pIXSSCIy7v00ViviFhruPtqY5uPcCQAF/dt0TlGyOwxOaC9bSzOk YK0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=EBbFm7h3; dkim=neutral (no key) header.i=@suse.cz header.s=susede2_ed25519; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m18-20020aa7d352000000b004358c3bfb61si16720451edr.141.2022.07.13.03.24.45; Wed, 13 Jul 2022 03:25:10 -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=@suse.cz header.s=susede2_rsa header.b=EBbFm7h3; dkim=neutral (no key) header.i=@suse.cz header.s=susede2_ed25519; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235223AbiGMJuz (ORCPT + 99 others); Wed, 13 Jul 2022 05:50:55 -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: 8bit 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 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) 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 -- 2.37.0