From patchwork Thu Aug 9 06:47:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 143812 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1721557ljj; Wed, 8 Aug 2018 23:49:05 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyN5iNCOzqtXTuntmz4jaL1Pib3i5i8OUb+CCMFJcca0CKBq8JpZnbjxnp9C4ysF1vmQgSH X-Received: by 2002:a62:51:: with SMTP id 78-v6mr983018pfa.135.1533797345639; Wed, 08 Aug 2018 23:49:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533797345; cv=none; d=google.com; s=arc-20160816; b=r7EhHJiDDM60nQ8liIqf5f5VnY17E6Gn0YW47MCqPw8CxbbHxIQ0vP1LuO0VJntnS/ vpScIuW3nOVtyeONZADNsBekN0hu9KSPv0cuEnED5ifdcz6O0gMvYOBDJtyljPUnhJMu 1qNehBBwIxmrjdCsOLyQX50jYFzPGpV9Gjhtffa/MA3P7pDi1j39aQYC4lYGqigDqAwW P6gxqA++G9RkEeOySiR9x/dW3dQ2sjk3mWG/Ky2QEz7c2n19dhRk5Lg+zBBKYMSkiUwg yypqgTaVPHNlI3mSf34qO1VO8kEVi3CJrxX39yRPM0cQloWM1OHORCQ7hZqYhrH1qD0O GByw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=ASiKMtRc+IY5ZV5HOVjsY/Z2lwC0ArSOr80wR78F9RU=; b=YkTNHnUedNInKRapPmmV/AX+Ll85tJj/0YCyhefJSChuci9un05GVpuW84c/6Zt0UX 37ckRfrFohJFoq4ik0bzgHffA2BW0ac617pnWO0hvXAJ5+Hi4mDRkaon+2Ehx1ttbb2/ JJ2+Ehz7adO6axnq1SRdcRg/p05ifVxOrYthghrKKFj6G01PdeI65Knq+LplxpVD9J6o n72qUTW+ZwcWuHg1fTX5Ta8bDAF0EYkzURAgNfAN1+ElaveAOVcd81G2/6JlFse0JL8u HM9bNgAvKFp6171cki3CvFUf2oXSmrZokEjuH8ygram6i9vF5g1lL8xNFBBD5pqpPoe3 CczQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=ho3n3hqO; 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 ca2-v6si5724096plb.305.2018.08.08.23.49.05; Wed, 08 Aug 2018 23:49:05 -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=ho3n3hqO; 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 S1728916AbeHIJM0 (ORCPT + 31 others); Thu, 9 Aug 2018 05:12:26 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:19417 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727704AbeHIJM0 (ORCPT ); Thu, 9 Aug 2018 05:12:26 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id w796lOa2009603; Thu, 9 Aug 2018 15:47:24 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com w796lOa2009603 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1533797245; bh=ASiKMtRc+IY5ZV5HOVjsY/Z2lwC0ArSOr80wR78F9RU=; h=From:To:Cc:Subject:Date:From; b=ho3n3hqOQVqrK8/tN1TWjp/N+P40fMaqb6on6skRs9k4LrfXrrMBaXhiHMF6TCw/S UMQZRv8C2/UnsymZ3YloJiXcaID3x4nHWQgH8SoKmTstf4qli6bghkQ5eIUmrzuxqI iSyVfXfFzBO3atRemFsJP6iuOvq3JExAPEpc90zCd+xDM8OBPT6kTA8VgRAyIheH63 J5MJ/PVNP0Umkr6Uw4BWcM45snw6iqpSDEvK8qqwsZ5H+66oC5DHGVwKhfDVkOulKZ 8WhepwgdaeoyjvmdCiTAmtv3vgsRYZzK3nsk/MeXOHUH6GaK9vFl68L1hSkdRG0B0L mHy2jFQe1f+uA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Dirk Gouders , Ulf Magnusson , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH] kconfig: fix the rule of mainmenu_stmt symbol Date: Thu, 9 Aug 2018 15:47:06 +0900 Message-Id: <1533797226-6547-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- scripts/kconfig/zconf.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 4b68272..95a4fd3 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 { @@ -117,7 +117,7 @@ start: mainmenu_stmt stmt_list | stmt_list; /* mainmenu entry */ -mainmenu_stmt: T_MAINMENU prompt nl +mainmenu_stmt: T_MAINMENU prompt T_EOL { menu_add_prompt(P_MENU, $2, NULL); };