From patchwork Tue Aug 2 19:03:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas KANDAGATLA X-Patchwork-Id: 1029922 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p72J47mU002156 for ; Tue, 2 Aug 2011 19:04:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755036Ab1HBTES (ORCPT ); Tue, 2 Aug 2011 15:04:18 -0400 Received: from eu1sys200aog115.obsmtp.com ([207.126.144.139]:37777 "EHLO eu1sys200aog115.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755040Ab1HBTER (ORCPT ); Tue, 2 Aug 2011 15:04:17 -0400 Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob115.postini.com ([207.126.147.11]) with SMTP ID DSNKTjhKL9sg2VnRnXAkUCutqHdnIsDwa31E@postini.com; Tue, 02 Aug 2011 19:04:17 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 52FCBBD for ; Tue, 2 Aug 2011 19:04:15 +0000 (GMT) Received: from mail7.sgp.st.com (mail7.sgp.st.com [164.129.223.81]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id E311C272B for ; Tue, 2 Aug 2011 19:04:14 +0000 (GMT) Received: from localhost (king.bri.st.com [10.65.51.191]) by mail7.sgp.st.com (MOS 4.1.8-GA) with ESMTP id AJO73367 (AUTH srinivak); Tue, 2 Aug 2011 21:04:14 +0200 From: Srinivas KANDAGATLA To: linux-kbuild@vger.kernel.org Cc: stuart.menefy@st.com, Srinivas Kandagatla Subject: [PATCH kernel-3.0] kbuild: Fix help text not displayed in choice option. Date: Tue, 2 Aug 2011 20:03:18 +0100 Message-Id: <1312311798-27851-1-git-send-email-srinivas.kandagatla@st.com> X-Mailer: git-send-email 1.6.3.3 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 02 Aug 2011 19:04:18 +0000 (UTC) From: Srinivas Kandagatla Help text under choice menu is never displayed because it does not have symbol name associated with it, however many kconfigs have help text under choice, assuming that it will be displayed when user selects help. This patch changes the logic in menu_get_ext_help to display help for cases which dont have symbol names like choice.. Signed-off-by: Srinivas Kandagatla Reviewed-by: Stuart Menefy --- To see this bug in action, go to "PCI access mode" under PCI support, and hit the help button. You will see no help text displayed. However in arch/x86/Kconfig under "PCI access mode" there is help section. Help text under choice menu is never displayed because it does not have symbol name associated with it, however many kconfigs have help text under choice, assuming that it will be displayed when user selects help. This patch changes the logic in menu_get_ext_help to display help for cases which dont have symbol names like choice. scripts/kconfig/menu.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index d660086..beeb92e 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -597,11 +597,10 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help) struct symbol *sym = menu->sym; if (menu_has_help(menu)) { - if (sym->name) { + if (sym->name) str_printf(help, "%s%s:\n\n", CONFIG_, sym->name); - str_append(help, _(menu_get_help(menu))); - str_append(help, "\n"); - } + str_append(help, _(menu_get_help(menu))); + str_append(help, "\n"); } else { str_append(help, nohelp_text); }