Received: by 2002:a5d:925a:0:0:0:0:0 with SMTP id e26csp551790iol; Thu, 9 Jun 2022 08:57:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJywo1uHrF9GoS/6+0LQEUIL4TPJxu2Czbcw9l8r8Xs76rOMhRL8K29GazR9QbxSDzURtkv9 X-Received: by 2002:a17:902:e80b:b0:168:b645:849e with SMTP id u11-20020a170902e80b00b00168b645849emr160123plg.26.1654790223217; Thu, 09 Jun 2022 08:57:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654790223; cv=none; d=google.com; s=arc-20160816; b=LE1OF2LGJaovis/iJPG6S3VAJlpz7263iGrEBvqiQQIEjuOYdGG5GLXvyeF62r0NSe RUYiYl/TcHPIWt5KrtyhXlliZMeq9iWPoJX6z8w0v+Te7NNkFybogzmRQroPFdZgyofT OIiDZPuMWL/i0xEfgmFhmZHRDF+GM/jhPupWq0rhuUtRz95nLubjJLWbgGgsI8wDhAHR IgUUoPNU40bQldr5PsSloHoW92R9p/phistvKQ9tSX+tytPbZ0hD5ZRBuoY2PWVLl9In Lc04Xm+/ae/5l5Og4EwTZoongOyvn38nh8UaijD4dntYTg+R1gxzS7aRApJGioW5OKvs e2iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=ogrOq9vhDIU1vnWkh0rFG1oDA7rFMvFTyJJAyFrFzFA=; b=hfjC3pmGG+q2RTMFdZdIPgSFtrk/WwfXWx7fPyJk/E3r+NTsvnh3VcD/6yie//E9ub oLWyx4QmkmQmfunQBh2gjR81QQqssmzWlv49K9fTjn7OprvWz3VSaaC1WGomijPHxhma +PkrAps/b2jpf33mOWd5XT9lLpHF3kfCpZbjl3V2Rzm7J7qm7pMREdYdBlLDmpOQMuKl qPHx7BuEQf4nM6ypSj5ug5Gi2Ez5gi4O+nngSZSlyYhFaXyO2J9A8IURZZARjY1/cBlS Kvxt7KwJPxXBe3q5fNPywnzg3pdsSmven58km3bJVWhv5VWiLNkMu1sL13156+j0y+x7 4dig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=yQUwVsdj; dkim=neutral (no key) header.i=@linutronix.de; 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=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k10-20020a170902ce0a00b0016891aa0280si7432995plg.614.2022.06.09.08.56.47; Thu, 09 Jun 2022 08:57:03 -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=@linutronix.de header.s=2020 header.b=yQUwVsdj; dkim=neutral (no key) header.i=@linutronix.de; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344272AbiFIPPu (ORCPT + 99 others); Thu, 9 Jun 2022 11:15:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344250AbiFIPPm (ORCPT ); Thu, 9 Jun 2022 11:15:42 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A6122E699; Thu, 9 Jun 2022 08:15:41 -0700 (PDT) Date: Thu, 09 Jun 2022 15:15:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1654787740; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ogrOq9vhDIU1vnWkh0rFG1oDA7rFMvFTyJJAyFrFzFA=; b=yQUwVsdjUfwDj1yuqopMlMBQkvxxWk3tndNXPl5xbNGyFJRJmoz53VqHVNOK9rxUKwwpeE 293l5KKTBdaQMK2XQwX5qr+rTxq6P404yQQPCWOb/z1inM05jVjYQts8RkyMUzqmM/ZOD9 CrodVY1eE0ysWz75IHiHm92B8dqXP3lkgUSZ/KNBZ7yS37ghykpa+jIgF0O35Rrb91X3R2 dX4RMC5n3XPhKCosnsuA6TUniMqE2sqCOKdPe18OIldyOhh2wnsyqnjTBHlrQa9524tZfO V5pFI4WE516NKueQv+f4EXFFByMOuHBXEUTSEQpB1PkB/EwjI8t14oG7ogNXtA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1654787740; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ogrOq9vhDIU1vnWkh0rFG1oDA7rFMvFTyJJAyFrFzFA=; b=M/FBsbpEucML2WYDiZuwuXO/coazzuQdR/gZnw3uH1P321Nc6Ii9beK8NWOKNo0wYf4fqD eWLdMPo8XUaXNaAw== From: "tip-bot2 for Josh Poimboeuf" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/urgent] objtool: Fix obsolete reference to CONFIG_X86_SMAP Cc: Lukas Bulwahn , Josh Poimboeuf , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <44c57668768c1ba1b4ba1ff541ec54781636e07c.1654101721.git.jpoimboe@kernel.org> References: <44c57668768c1ba1b4ba1ff541ec54781636e07c.1654101721.git.jpoimboe@kernel.org> MIME-Version: 1.0 Message-ID: <165478773912.4207.17052247168855339682.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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,URIBL_BLOCKED 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 following commit has been merged into the objtool/urgent branch of tip: Commit-ID: c2f75a43f5ae48b9babeb5b82c9f23fe18d3d144 Gitweb: https://git.kernel.org/tip/c2f75a43f5ae48b9babeb5b82c9f23fe18d3d144 Author: Josh Poimboeuf AuthorDate: Wed, 01 Jun 2022 09:42:12 -07:00 Committer: Josh Poimboeuf CommitterDate: Mon, 06 Jun 2022 11:49:55 -07:00 objtool: Fix obsolete reference to CONFIG_X86_SMAP 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 Link: https://lore.kernel.org/r/44c57668768c1ba1b4ba1ff541ec54781636e07c.1654101721.git.jpoimboe@kernel.org --- lib/Kconfig.ubsan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Kconfig.ubsan b/lib/Kconfig.ubsan index c4fe15d..a9f7eb0 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