From patchwork Thu Jun 14 10:36:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 138540 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1935363lji; Thu, 14 Jun 2018 03:37:58 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIqhlh+Faw5QQ6+v5axuVEcdrfTkUh8oR1U9QerJp47hspUqVhrrHiH2EOLYHznd4jSnpCr X-Received: by 2002:a62:9f16:: with SMTP id g22-v6mr8745698pfe.207.1528972678512; Thu, 14 Jun 2018 03:37:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528972678; cv=none; d=google.com; s=arc-20160816; b=KaiiX+V0mAzLjzsrGETwrRdEUDxAxtEICEOXTlY9/7gf4YKJvER+9vDPf03YcrIqbh WBgrWfGNCCCVqxmWn5TmRmr50nGz7kiAFwvqv6j9tnKiX0W3uROyQaDMOzcrqa5vLQTh 3BxBvEotjPb/tyG0OVTHWgycNzgNaLfXm2WazrvpHp+SfXU+laA6aXV8XosOyU/3p6CQ CPKkURFnHPvLOidWO99O+SNJoQFQeEWLB7ICPtX8t5hTgI7aJQuZOSshaFnwb/WOaloy YqQvWWeXYq7tZ6bn3txTXx1VFZOolU/PLgEgGpO5Zb/4qJlZWMWvJImQteuyTVxVW+2E StYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=D6RBD1FQAs9xM50ah7jHEdg+RGlc5qJNCxFTeU5F4Pw=; b=tAKLJw3VC4QnQQWjQ6hdAGyNxpvzcal++x+32ZJDlLafcGdqXyO74VCMaw6KhoZTQ5 1QnQ+oSeEDkSPandBc5oJvxqnnd4bq0jKGSrFpDNWLiyvupwZIToUZyGRsdXZJx8tadD alMw/RxKuMAfrAseZBhus0kEG5gWqQ+lS34dJ85tb/ueSXidHIFrTDwHCJXz1VrsNpeW J+EswdQullTyub7NsY4E39uYsT8DSr64N/wSrAP9HEYaEABymKMVoOxklgGguVDsJrcw 7B7zBeUDEGactqPDR3wM0BnlneFej2X+31yUcmCpztDo01IgyAoGV12g6fmWW2H1KuzQ hahg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=rn9T+m4h; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z14-v6si4250717pgz.264.2018.06.14.03.37.58; Thu, 14 Jun 2018 03:37:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=rn9T+m4h; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755030AbeFNKhc (ORCPT + 30 others); Thu, 14 Jun 2018 06:37:32 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:43055 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754860AbeFNKha (ORCPT ); Thu, 14 Jun 2018 06:37:30 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w5EAaqEf008870; Thu, 14 Jun 2018 19:36:53 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w5EAaqEf008870 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1528972613; bh=D6RBD1FQAs9xM50ah7jHEdg+RGlc5qJNCxFTeU5F4Pw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rn9T+m4h6xURvxsypvcdfB0ATPUqvNTuIyqpVBNTYU7RTB/XaQi+YkMHYvpUpv1gE y/CVfcI/r+qI6EatsyBUXPycc7oTBLz2Z6hSdzac4k3WwBKTF4xwneXhn6LO94Ie4l wP+ZvyyulqKTf4Vr9vXJiPxJdyJ+pQQ5207DeZ7XMmilLP2g5ws5bI0Lb/QKkmfcFh 75znwp+t56CYgdQ6mfA7qZxXMfIHXvpqNbD4S3D0qLzC5d6mJM9TYqcBGzaQrS8Kso ZBtnki2GH2jmATvD+w0aXNLjpMAQVU2GYa1/s6hcPbkMuiVykHGlrnzeBV28UljcuP UZpuCC0I8doew== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Linus Torvalds Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Kees Cook , Masahiro Yamada Subject: [PATCH 1/3] x86: fix dependency of X86_32_LAZY_GS Date: Thu, 14 Jun 2018 19:36:43 +0900 Message-Id: <1528972605-24264-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528972605-24264-1-git-send-email-yamada.masahiro@socionext.com> References: <1528972605-24264-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 2a61f4747eea ("stack-protector: test compiler capability in Kconfig and drop AUTO mode") replaced the 'choice' with two boolean symbols, so CC_STACKPROTECTOR_NONE no longer exists. Prior to commit 2bc2f688fdf8 ("Makefile: move stack-protector availability out of Kconfig"), this line was like this: depends on X86_32 && !CC_STACKPROTECTOR The CC_ prefix was dropped by commit 050e9baa9dc9 ("Kbuild: rename CC_STACKPROTECTOR[_STRONG] config variables"), so the dependency now should be: depends on X86_32 && !STACKPROTECTOR Signed-off-by: Masahiro Yamada --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 455a670..d6c6ee6 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -327,7 +327,7 @@ config X86_64_SMP config X86_32_LAZY_GS def_bool y - depends on X86_32 && CC_STACKPROTECTOR_NONE + depends on X86_32 && !STACKPROTECTOR config ARCH_SUPPORTS_UPROBES def_bool y