Received: by 2002:a19:771d:0:0:0:0:0 with SMTP id s29csp1247239lfc; Wed, 1 Jun 2022 13:00:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyiZeodmiO7rEAuYRflA19QejqWq6kILuSmDQ/vIOHy8UMuFyTKjBisFrj4aUTJ3H/w433 X-Received: by 2002:a17:90b:4ac1:b0:1e6:7c82:9aee with SMTP id mh1-20020a17090b4ac100b001e67c829aeemr1095565pjb.234.1654113639777; Wed, 01 Jun 2022 13:00:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654113639; cv=none; d=google.com; s=arc-20160816; b=PzEv8/6cLqsNHsP5cmZsd/T/ScJ4auGds3qeFgRN86Hs4+yTfgBEJwxpm1tYhMr11D 8D7akP/0bRvd3cHBNVOa2RK2SGOUSdBPYqK5dHm5Lm+2zSqQrqeTRMczKHpfvbh4n1lZ q3ot2ffUEDkBI7oPqowOQfka9+ZZ2D6T+DRGjegwOK/dOwSKd5m6HmRkc093LpWjiFPK qg3Vcu/hmoSi1UapJKgyOulN4zXhtquyIXRemFFIppWeHULSnHkHZuxnyt3C/nFEsju8 BMg9LbyieOYkcZs/4aNg5+Xzzw3CZNfIockBXo9tCsqFs6Uru3aVsrRwOxOAwf9XL06T VbdA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=Dz+8K4naEhtZlJGdX47lQ+af/wNzOdO4Y016nj1Yi9s=; b=mZZWEUNNaJZjuI6D3BNikyJB5nTt5/f8V0/EO7jy8gA0NToTZhTB2GBf8Z+0Ypf0t3 kLMRrd33YnQpBty4gBF3+FPyKEOvp1akqVBvCWrDJZOw0rfxVkhFAkVOuP67ZSJ/e+se b2/4AtrP1XdxLTQox1bSihjPqXBXq7BIAv73mF7JEdXAmk+29g/VPZHYhUnxqZf34wAZ R3f0Ro221AtcSUsU1Z7v+MhCVHcekf+ZcWy6N0+jjRjeKFSkLhpcG5vM77/mRetnOx0h g4x0LhCD2emkQHjyF6kim1KVpqY4EJ1s2wY5nBMUx88h0ekk3YpyIF28r3bdsYVOi/IB JcUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IfN9K8ql; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id ns21-20020a17090b251500b001bd14e01f2asi6209601pjb.24.2022.06.01.13.00.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 13:00:39 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IfN9K8ql; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 86A621D30C3; Wed, 1 Jun 2022 12:19:03 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349870AbiFAQm1 (ORCPT + 99 others); Wed, 1 Jun 2022 12:42:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233630AbiFAQm1 (ORCPT ); Wed, 1 Jun 2022 12:42:27 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 611ED3C492 for ; Wed, 1 Jun 2022 09:42:26 -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 dfw.source.kernel.org (Postfix) with ESMTPS id EB5F9615C7 for ; Wed, 1 Jun 2022 16:42:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 214B9C385B8; Wed, 1 Jun 2022 16:42:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654101745; bh=/xBaBBACrWyAc7xVPLhMoHdDwZ56uG6euBy9G76MsTg=; h=From:To:Cc:Subject:Date:From; b=IfN9K8qlFPktqlFvxyIq7m/+xksy4Ibt3VnNEnJjq+38hKwHJlZyv/MzsoR3l0tzG 0DkzbNmZMbOTQweccDphnJQHt7NV0DhQivmLY40vZZyGcAfddnXH+cyJaC8Ss/P2wK lhdv7KRt9ZRyTppQvGjHrwEzdCxzpEB8gQdUq3KSKWu0o0VaK8qe1rXBu2LCHaxTk8 eG1a8SfYOrtjp+3HpYyWjdVmntTNpOpaVfNmY8lDLZacg2Q9X2iH4aWj52banwxLaP zkK1N1TE97cS55/UO3TVB6OmG5kbXqbysB0j2KmKOQ8XwpIpLJWIgsC1rs2qPiNnh1 CIRdmHBviJuGg== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Lukas Bulwahn Subject: [PATCH] objtool: Fix obsolete reference to CONFIG_X86_SMAP Date: Wed, 1 Jun 2022 09:42:12 -0700 Message-Id: <44c57668768c1ba1b4ba1ff541ec54781636e07c.1654101721.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.34.3 MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 CONFIG_X86_SMAP no longer exists. For objtool's purposes it has been replaced with CONFIG_HAVE_UACCESS_VALIDATION. Fixes: 03f16cd020eb ("objtool: Add CONFIG_OBJTOOL") Reported-by: Lukas Bulwahn Signed-off-by: Josh Poimboeuf --- lib/Kconfig.ubsan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Kconfig.ubsan b/lib/Kconfig.ubsan index c4fe15d38b60..a9f7eb047768 100644 --- a/lib/Kconfig.ubsan +++ b/lib/Kconfig.ubsan @@ -94,7 +94,7 @@ config UBSAN_UNREACHABLE bool "Perform checking for unreachable code" # objtool already handles unreachable checking and gets angry about # seeing UBSan instrumentation located in unreachable places. - depends on !(OBJTOOL && (STACK_VALIDATION || UNWINDER_ORC || X86_SMAP)) + depends on !(OBJTOOL && (STACK_VALIDATION || UNWINDER_ORC || HAVE_UACCESS_VALIDATION)) depends on $(cc-option,-fsanitize=unreachable) help This option enables -fsanitize=unreachable which checks for control -- 2.34.3