From patchwork Thu Oct 25 14:10:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 149531 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1391671ljp; Thu, 25 Oct 2018 07:12:24 -0700 (PDT) X-Google-Smtp-Source: AJdET5dg4ttuS3aKwyIF/UHpRjTMJFvfZn34PSegdhK8aX5niQhmSP4oH5JYmO/udmJs5482/k2l X-Received: by 2002:a63:c251:: with SMTP id l17-v6mr1663746pgg.146.1540476744167; Thu, 25 Oct 2018 07:12:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540476744; cv=none; d=google.com; s=arc-20160816; b=qBLseF1c8aDzAptWziQixbEk9vnjB5HuSXlCpwpiEUxa0UYXdoswYvQkhAvz65BJiA wpKuO+8Bsh99Kox6I2IW7v7nNkg2bCcg6UiSBhOPaH/141d/1XT334pu/n1mxcfbb6c0 qqtxcDIhWU2naYm5brMqUbzAkucWOKQhtbWPY5t7pFMgsov3sVjgVyCYsaNvALPA9M97 baUf1KHjicuTRrCfaj9qFpLLJaWwsIPjsvjFShI7rYBkbq6BX8hLPj44HEawMmXmjyCR WsR1dydHPWxT7VF3yvVBEam+COQbCR+CnbKx8rGRnC6cZFrVQaqzM2LfRmCUtcaMS6Zw A3Xg== 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; bh=a80O0D8+/oGS8Shvj5ENmiLNFX0jyRJvvS9oT1ZbIbE=; b=P/OwrE1+2980bs9BHXXvEN4IC4+ZEDwk1TgqN0E/PMChpVQqE13uIy3oJm82RhsjNt 2zIY990S3lXLYUwEfU1Ll3XgRj9sGaEBLvmLMuiGLLYwliNX/h5nuz0iysiJNCM7NR/l 3TMUYs6GGcFwD8cp9b/5FJ9N/ApMJ1AhZMxe2j250K/e9RGayczK95RlZDnc7xMOB+c3 qDgzi6pHKWEOx/60CNPUaYdMHObZTV7HA8FI6lzVQoBRex7PdpuWC1mnb6eGXQOvdwX6 psO/Eh+LQx7zvv1EF9MBeyjBprVMAHw7y4Epd1rQHGWzTP3XD9Awi30rw4AMhWvKYnrd AQiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Ikyxum6m; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1-v6si8252504pls.296.2018.10.25.07.12.23; Thu, 25 Oct 2018 07:12:24 -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=@kernel.org header.s=default header.b=Ikyxum6m; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728458AbeJYWow (ORCPT + 32 others); Thu, 25 Oct 2018 18:44:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:53950 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728299AbeJYWow (ORCPT ); Thu, 25 Oct 2018 18:44:52 -0400 Received: from sasha-vm.mshome.net (unknown [167.98.65.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CB9922084A; Thu, 25 Oct 2018 14:11:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1540476716; bh=OfIb3tJbSf8EMUDaBaLd/MmMDMaVmV0GpzbdtVabMgs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ikyxum6mX/q9xaneH39kPn4v23diqWBYQgeIDt8fd4xV9d3czANRRpXfgz/1BhwW5 VHepcveqC6UFIUy/JhAH1OoW9fryyueGwpIWggBWlqcI55Ad54tiWQTBQBKBquUOvC pvJowRAqJtG8+LcpqmC/9MIGThqGwHlost5GIYjo= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Masahiro Yamada , Sasha Levin Subject: [PATCH AUTOSEL 4.14 44/46] kconfig: fix the rule of mainmenu_stmt symbol Date: Thu, 25 Oct 2018 10:10:51 -0400 Message-Id: <20181025141053.213330-44-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025141053.213330-1-sashal@kernel.org> References: <20181025141053.213330-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masahiro Yamada [ Upstream commit 56869d45e364244a721de34ce9c5dc9ed022779e ] The rule of mainmenu_stmt does not have debug print of zconf_lineno(), but if it had, it would print a wrong line number for the same reason as commit b2d00d7c61c8 ("kconfig: fix line numbers for if-entries in menu tree"). The mainmenu_stmt does not need to eat following empty lines because they are reduced to common_stmt. Signed-off-by: Masahiro Yamada Signed-off-by: Sasha Levin --- scripts/kconfig/zconf.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 126e3f2e1ed7..2b0adeb5fc42 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y @@ -31,7 +31,7 @@ struct symbol *symbol_hash[SYMBOL_HASHSIZE]; static struct menu *current_menu, *current_entry; %} -%expect 31 +%expect 30 %union { @@ -112,7 +112,7 @@ start: mainmenu_stmt stmt_list | no_mainmenu_stmt stmt_list; /* mainmenu entry */ -mainmenu_stmt: T_MAINMENU prompt nl +mainmenu_stmt: T_MAINMENU prompt T_EOL { menu_add_prompt(P_MENU, $2, NULL); };