Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kconfig updates from Michal Marek:
 - use pkg-config to detect curses libraries
 - clean up the way curses headers are searched
 - Some randconfig fixes, of which one had to be reverted
 - KCONFIG_SEED for randconfig debugging
 - memuconfig memory leak plugged
 - menuconfig > breadcrumbs > navigation
 - xconfig compilation fix
 - Other minor fixes

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig: fix lists definition for C++
  Revert "kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG"
  kconfig: implement KCONFIG_PROBABILITY for randconfig
  kconfig: allow specifying the seed for randconfig
  kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG
  kconfig: do not override symbols already set
  kconfig: fix randconfig tristate detection
  kconfig/lxdialog: rationalise the include paths where to find {.n}curses{,w}.h
  menuconfig: Add "breadcrumbs" navigation aid
  menuconfig: Fix memory leak introduced by jump keys feature
  merge_config.sh: Avoid creating unnessary source softlinks
  kconfig: optionally use pkg-config to detect ncurses libs
  menuconfig: optionally use pkg-config to detect ncurses libs

9 files changed, 245 insertions, 12 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 231b4759c714..844bc9da08da 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -219,7 +219,9 @@ HOSTCFLAGS_gconf.o	= `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
 
 HOSTLOADLIBES_mconf   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
 
-HOSTLOADLIBES_nconf     = -lmenu -lpanel -lncurses
+HOSTLOADLIBES_nconf     = $(shell \
+                                pkg-config --libs menu panel ncurses 2>/dev/null \
+                                || echo "-lmenu -lpanel -lncurses"  )
 $(obj)/qconf.o: $(obj)/.tmp_qtcheck
 
 ifeq ($(qconf-target),1)
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index e39fcd8143ea..bde5b95c8c19 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -13,6 +13,7 @@
 #include <getopt.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <errno.h>
 
 #include "lkc.h"
 
@@ -514,14 +515,23 @@ int main(int ac, char **av)
                 {
                         struct timeval now;
                         unsigned int seed;
+                        char *seed_env;
 
                         /*
                          * Use microseconds derived seed,
                          * compensate for systems where it may be zero
                          */
                         gettimeofday(&now, NULL);
-
                         seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1));
+
+                        seed_env = getenv("KCONFIG_SEED");
+                        if( seed_env && *seed_env ) {
+                                char *endp;
+                                int tmp = (int)strtol(seed_env, &endp, 10);
+                                if (*endp == '\0') {
+                                        seed = tmp;
+                                }
+                        }
                         srand(seed);
                         break;
                 }
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 13ddf1126c2a..43eda40c3838 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -1106,10 +1106,54 @@ static void set_all_choice_values(struct symbol *csym)
 void conf_set_all_new_symbols(enum conf_def_mode mode)
 {
         struct symbol *sym, *csym;
-        int i, cnt;
+        int i, cnt, pby, pty, ptm;      /* pby: probability of boolean  = y
+                                         * pty: probability of tristate = y
+                                         * ptm: probability of tristate = m
+                                         */
+
+        pby = 50; pty = ptm = 33; /* can't go as the default in switch-case
+                                   * below, otherwise gcc whines about
+                                   * -Wmaybe-uninitialized */
+        if (mode == def_random) {
+                int n, p[3];
+                char *env = getenv("KCONFIG_PROBABILITY");
+                n = 0;
+                while( env && *env ) {
+                        char *endp;
+                        int tmp = strtol( env, &endp, 10 );
+                        if( tmp >= 0 && tmp <= 100 ) {
+                                p[n++] = tmp;
+                        } else {
+                                errno = ERANGE;
+                                perror( "KCONFIG_PROBABILITY" );
+                                exit( 1 );
+                        }
+                        env = (*endp == ':') ? endp+1 : endp;
+                        if( n >=3 ) {
+                                break;
+                        }
+                }
+                switch( n ) {
+                case 1:
+                        pby = p[0]; ptm = pby/2; pty = pby-ptm;
+                        break;
+                case 2:
+                        pty = p[0]; ptm = p[1]; pby = pty + ptm;
+                        break;
+                case 3:
+                        pby = p[0]; pty = p[1]; ptm = p[2];
+                        break;
+                }
+
+                if( pty+ptm > 100 ) {
+                        errno = ERANGE;
+                        perror( "KCONFIG_PROBABILITY" );
+                        exit( 1 );
+                }
+        }
 
         for_all_symbols(i, sym) {
-                if (sym_has_value(sym))
+                if (sym_has_value(sym) || (sym->flags & SYMBOL_VALID))
                         continue;
                 switch (sym_get_type(sym)) {
                 case S_BOOLEAN:
@@ -1125,8 +1169,15 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
                                 sym->def[S_DEF_USER].tri = no;
                                 break;
                         case def_random:
-                                cnt = sym_get_type(sym) == S_TRISTATE ? 3 : 2;
-                                sym->def[S_DEF_USER].tri = (tristate)(rand() % cnt);
+                                sym->def[S_DEF_USER].tri = no;
+                                cnt = rand() % 100;
+                                if (sym->type == S_TRISTATE) {
+                                        if (cnt < pty)
+                                                sym->def[S_DEF_USER].tri = yes;
+                                        else if (cnt < (pty+ptm))
+                                                sym->def[S_DEF_USER].tri = mod;
+                                } else if (cnt < pby)
+                                        sym->def[S_DEF_USER].tri = yes;
                                 break;
                         default:
                                 continue;
diff --git a/scripts/kconfig/list.h b/scripts/kconfig/list.h
index 0ae730be5f49..685d80e1bb0e 100644
--- a/scripts/kconfig/list.h
+++ b/scripts/kconfig/list.h
@@ -51,6 +51,19 @@ struct list_head {
              pos = list_entry(pos->member.next, typeof(*pos), member))
 
 /**
+ * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * @pos:        the type * to use as a loop cursor.
+ * @n:          another type * to use as temporary storage
+ * @head:       the head for your list.
+ * @member:     the name of the list_struct within the struct.
+ */
+#define list_for_each_entry_safe(pos, n, head, member)                  \
+        for (pos = list_entry((head)->next, typeof(*pos), member),      \
+                n = list_entry(pos->member.next, typeof(*pos), member); \
+             &pos->member != (head);                                    \
+             pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+/**
  * list_empty - tests whether a list is empty
  * @head: the list to test.
  */
@@ -88,4 +101,31 @@ static inline void list_add_tail(struct list_head *_new, struct list_head *head)
         __list_add(_new, head->prev, head);
 }
 
+/*
+ * Delete a list entry by making the prev/next entries