sync to torvalds/linux@de2f378

JiauZhang · Nov 10, 2024 · 6e4cbf5 · 6e4cbf5
1 parent b362cbf
commit 6e4cbf5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.gitpicker.json b/.gitpicker.json
@@ -2,7 +2,7 @@
     {
         "user": "torvalds",
         "repo": "linux",
-        "branch": "11066801dd4b7c4d75fce65c812723a80c1481ae",
+        "branch": "de2f378f2b771b39594c04695feee86476743a69",
         "data": [
             {
                 "root": "scripts/kconfig",

diff --git a/menu.c b/menu.c
@@ -533,6 +533,7 @@ bool menu_is_empty(struct menu *menu)
 
 bool menu_is_visible(struct menu *menu)
 {
+	struct menu *child;
 	struct symbol *sym;
 	tristate visible;
 
@@ -551,7 +552,17 @@ bool menu_is_visible(struct menu *menu)
 	} else
 		visible = menu->prompt->visible.tri = expr_calc_value(menu->prompt->visible.expr);
 
-	return visible != no;
+	if (visible != no)
+		return true;
+
+	if (!sym || sym_get_tristate_value(menu->sym) == no)
+		return false;
+
+	for (child = menu->list; child; child = child->next)
+		if (menu_is_visible(child))
+			return true;
+
+	return false;
 }
 
 const char *menu_get_prompt(const struct menu *menu)