Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-14 11:55:46 +0100
committerTakashi Iwai <tiwai@suse.de>2019-02-14 11:55:50 +0100
commit83b0eec88094bc4d2b498e928bb1438bddbfc1cb (patch)
treead06ebeb4eb0a6ed21ae3e4adeb5cd2309e737dd
parent9444514e6c16c383abe13da144bc783dee7d38ef (diff)
kconfig: fix the rule of mainmenu_stmt symbol (bsc#1051510).
-rw-r--r--patches.fixes/kconfig-fix-the-rule-of-mainmenu_stmt-symbol.patch48
-rw-r--r--series.conf1
2 files changed, 49 insertions, 0 deletions
diff --git a/patches.fixes/kconfig-fix-the-rule-of-mainmenu_stmt-symbol.patch b/patches.fixes/kconfig-fix-the-rule-of-mainmenu_stmt-symbol.patch
new file mode 100644
index 0000000000..a617cd8d0b
--- /dev/null
+++ b/patches.fixes/kconfig-fix-the-rule-of-mainmenu_stmt-symbol.patch
@@ -0,0 +1,48 @@
+From 56869d45e364244a721de34ce9c5dc9ed022779e Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+Date: Thu, 9 Aug 2018 15:47:06 +0900
+Subject: [PATCH] kconfig: fix the rule of mainmenu_stmt symbol
+Git-commit: 56869d45e364244a721de34ce9c5dc9ed022779e
+Patch-mainline: v4.19-rc1
+References: bsc#1051510
+
+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>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ scripts/kconfig/zconf.y | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
+index 96081aa0fef0..22fceb264cf5 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);
+ };
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index b03627619e..9f5ef5e2b4 100644
--- a/series.conf
+++ b/series.conf
@@ -17927,6 +17927,7 @@
patches.fixes/audit-Fix-extended-comparison-of-GID-EGID.patch
patches.drivers/audit-fix-use-after-free-in-audit_add_watch.patch
patches.fixes/kbuild-verify-that-depmod-is-installed.patch
+ patches.fixes/kconfig-fix-the-rule-of-mainmenu_stmt-symbol.patch
patches.arch/x86-i8259-add-missing-include-file
patches.drivers/net-usb-r8152-use-irqsave-in-USB-s-complete-callback.patch
patches.drivers/net-hns3-rename-the-interface-for-init_client_instan.patch