diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-08-09 15:47:06 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-04 14:52:45 +0100 |
| commit | 48f1b3b56ee4f936c105b550ca4357722d6460da (patch) | |
| tree | 0e12ed719baf0ee61e5a4a6aa70e670f94c20cee /scripts | |
| parent | cbc38304947ea2e57440bb38b733613e3f003605 (diff) | |
| download | linux-exynos-48f1b3b56ee4f936c105b550ca4357722d6460da.tar.gz linux-exynos-48f1b3b56ee4f936c105b550ca4357722d6460da.tar.bz2 linux-exynos-48f1b3b56ee4f936c105b550ca4357722d6460da.zip | |
kconfig: fix the rule of mainmenu_stmt symbol
[ 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 <yamada.masahiro@socionext.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/zconf.y | 4 |
1 files changed, 2 insertions, 2 deletions
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); }; |