Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (30 commits)
  Use macros for .data.page_aligned section.
  Use macros for .bss.page_aligned section.
  Use new __init_task_data macro in arch init_task.c files.
  kbuild: Don't define ALIGN and ENTRY when preprocessing linker scripts.
  arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0
  kbuild: add static to prototypes
  kbuild: fail build if recordmcount.pl fails
  kbuild: set -fconserve-stack option for gcc 4.5
  kbuild: echo the record_mcount command
  gconfig: disable "typeahead find" search in treeviews
  kbuild: fix cc1 options check to ensure we do not use -fPIC when compiling
  checkincludes.pl: add option to remove duplicates in place
  markup_oops: use modinfo to avoid confusion with underscored module names
  checkincludes.pl: provide usage helper
  checkincludes.pl: close file as soon as we're done with it
  ctags: usability fix
  kernel hacking: move STRIP_ASM_SYMS from General
  gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma
  kbuild: Check if linker supports the -X option
  kbuild: introduce ld-option
  ...

Fix trivial conflict in scripts/basic/fixdep.c

1 files changed, 3 insertions, 75 deletions

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 25b60bc117f7..d82953573588 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -199,8 +199,6 @@ inputbox_instructions_string[] = N_(
 setmod_text[] = N_(
         "This feature depends on another which has been configured as a module.\n"
         "As a result, this feature will be built as a module."),
-nohelp_text[] = N_(
-        "There is no help available for this kernel option.\n"),
 load_config_text[] = N_(
         "Enter the name of the configuration file you wish to load.  "
         "Accept the name shown to restore the configuration you "
@@ -284,66 +282,6 @@ static void show_textbox(const char *title, const char *text, int r, int c);
 static void show_helptext(const char *title, const char *text);
 static void show_help(struct menu *menu);
 
-static void get_prompt_str(struct gstr *r, struct property *prop)
-{
-        int i, j;
-        struct menu *submenu[8], *menu;
-
-        str_printf(r, _("Prompt: %s\n"), _(prop->text));
-        str_printf(r, _("  Defined at %s:%d\n"), prop->menu->file->name,
-                prop->menu->lineno);
-        if (!expr_is_yes(prop->visible.expr)) {
-                str_append(r, _("  Depends on: "));
-                expr_gstr_print(prop->visible.expr, r);
-                str_append(r, "\n");
-        }
-        menu = prop->menu->parent;
-        for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent)
-                submenu[i++] = menu;
-        if (i > 0) {
-                str_printf(r, _("  Location:\n"));
-                for (j = 4; --i >= 0; j += 2) {
-                        menu = submenu[i];
-                        str_printf(r, "%*c-> %s", j, ' ', _(menu_get_prompt(menu)));
-                        if (menu->sym) {
-                                str_printf(r, " (%s [=%s])", menu->sym->name ?
-                                        menu->sym->name : _("<choice>"),
-                                        sym_get_string_value(menu->sym));
-                        }
-                        str_append(r, "\n");
-                }
-        }
-}
-
-static void get_symbol_str(struct gstr *r, struct symbol *sym)
-{
-        bool hit;
-        struct property *prop;
-
-        if (sym && sym->name)
-                str_printf(r, "Symbol: %s [=%s]\n", sym->name,
-                                                    sym_get_string_value(sym));
-        for_all_prompts(sym, prop)
-                get_prompt_str(r, prop);
-        hit = false;
-        for_all_properties(sym, prop, P_SELECT) {
-                if (!hit) {
-                        str_append(r, "  Selects: ");
-                        hit = true;
-                } else
-                        str_printf(r, " && ");
-                expr_gstr_print(prop->expr, r);
-        }
-        if (hit)
-                str_append(r, "\n");
-        if (sym->rev_dep.expr) {
-                str_append(r, _("  Selected by: "));
-                expr_gstr_print(sym->rev_dep.expr, r);
-                str_append(r, "\n");
-        }
-        str_append(r, "\n\n");
-}
-
 static struct gstr get_relations_str(struct symbol **sym_arr)
 {
         struct symbol *sym;
@@ -699,19 +637,9 @@ static void show_helptext(const char *title, const char *text)
 static void show_help(struct menu *menu)
 {
         struct gstr help = str_new();
-        struct symbol *sym = menu->sym;
-
-        if (menu_has_help(menu))
-        {
-                if (sym->name) {
-                        str_printf(&help, "CONFIG_%s:\n\n", sym->name);
-                        str_append(&help, _(menu_get_help(menu)));
-                        str_append(&help, "\n");
-                }
-        } else {
-                str_append(&help, nohelp_text);
-        }
-        get_symbol_str(&help, sym);
+
+        menu_get_ext_help(menu, &help);
+
         show_helptext(_(menu_get_prompt(menu)), str_get(&help));
         str_free(&help);
 }