12 files changed, 118 insertions, 87 deletions

diff --git a/CREDITS b/CREDITS
index 58d2a02add39..a7ea8e343836 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3917,6 +3917,10 @@ S: Flandernstrasse 101
 S: D-73732 Esslingen
 S: Germany
 
+N: Roman Zippel
+E: zippel@linux-m68k.org
+D: AFFS and HFS filesystems, m68k maintainer, new kernel configuration in 2.5
+
 N: Leonard N. Zubkoff
 W: http://www.dandelion.com/Linux/
 D: BusLogic SCSI driver
diff --git a/Documentation/kbuild/kconfig-language.txt b/Documentation/kbuild/kconfig-language.txt
index b507d61fd41c..44e2649fbb29 100644
--- a/Documentation/kbuild/kconfig-language.txt
+++ b/Documentation/kbuild/kconfig-language.txt
@@ -113,6 +113,13 @@ applicable everywhere (see syntax).
         That will limit the usefulness but on the other hand avoid
         the illegal configurations all over.
 
+- limiting menu display: "visible if" <expr>
+  This attribute is only applicable to menu blocks, if the condition is
+  false, the menu block is not displayed to the user (the symbols
+  contained there can still be selected by other symbols, though). It is
+  similar to a conditional "prompt" attribude for individual menu
+  entries. Default value of "visible" is true.
+
 - numerical ranges: "range" <symbol> <symbol> ["if" <expr>]
   This allows to limit the range of possible input values for int
   and hex symbols. The user can only input a value which is larger than
@@ -303,7 +310,8 @@ menu:
         "endmenu"
 
 This defines a menu block, see "Menu structure" above for more
-information. The only possible options are dependencies.
+information. The only possible options are dependencies and "visible"
+attributes.
 
 if:
 
@@ -381,3 +389,25 @@ config FOO
 
 limits FOO to module (=m) or disabled (=n).
 
+Kconfig symbol existence
+~~~~~~~~~~~~~~~~~~~~~~~~
+The following two methods produce the same kconfig symbol dependencies
+but differ greatly in kconfig symbol existence (production) in the
+generated config file.
+
+case 1:
+
+config FOO
+        tristate "about foo"
+        depends on BAR
+
+vs. case 2:
+
+if BAR
+config FOO
+        tristate "about foo"
+endif
+
+In case 1, the symbol FOO will always exist in the config file (given
+no other dependencies).  In case 2, the symbol FOO will only exist in
+the config file if BAR is enabled.
diff --git a/Documentation/kbuild/kconfig.txt b/Documentation/kbuild/kconfig.txt
index cca46b1a0f6c..c313d71324b4 100644
--- a/Documentation/kbuild/kconfig.txt
+++ b/Documentation/kbuild/kconfig.txt
@@ -48,11 +48,6 @@ KCONFIG_OVERWRITECONFIG
 If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not
 break symlinks when .config is a symlink to somewhere else.
 
-KCONFIG_NOTIMESTAMP
---------------------------------------------------
-If this environment variable exists and is non-null, the timestamp line
-in generated .config files is omitted.
-
 ______________________________________________________________________
 Environment variables for '{allyes/allmod/allno/rand}config'
 
diff --git a/MAINTAINERS b/MAINTAINERS
index a26c9ee7703d..43494463b57d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3597,10 +3597,9 @@ F:	Documentation/hwmon/k8temp
 F:      drivers/hwmon/k8temp.c
 
 KCONFIG
-M:      Roman Zippel <zippel@linux-m68k.org>
+M:      Michal Marek <mmarek@suse.cz>
 L:      linux-kbuild@vger.kernel.org
-Q:      http://patchwork.kernel.org/project/linux-kbuild/list/
-S:      Maintained
+S:      Odd Fixes
 F:      Documentation/kbuild/kconfig-language.txt
 F:      scripts/kconfig/
 
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 368ae306aee4..faa9a4701b6f 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -77,14 +77,15 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
 # The symlink is used to repair a deficiency in arch/um
 update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
         $(Q)echo "  GEN config"
-        $(Q)xgettext --default-domain=linux              \
-            --add-comments --keyword=_ --keyword=N_      \
-            --from-code=UTF-8                            \
-            --files-from=scripts/kconfig/POTFILES.in     \
+        $(Q)xgettext --default-domain=linux                         \
+            --add-comments --keyword=_ --keyword=N_                 \
+            --from-code=UTF-8                                       \
+            --files-from=$(srctree)/scripts/kconfig/POTFILES.in     \
+            --directory=$(srctree) --directory=$(objtree)           \
             --output $(obj)/config.pot
         $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
-        $(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
-        $(Q)(for i in `ls arch/*/Kconfig`;               \
+        $(Q)ln -fs Kconfig.x86 arch/um/Kconfig
+        $(Q)(for i in `ls $(srctree)/arch/*/Kconfig`;    \
             do                                           \
                 echo "  GEN $$i";                        \
                 $(obj)/kxgettext $$i                     \
@@ -92,7 +93,7 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
             done )
         $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
             --output $(obj)/linux.pot
-        $(Q)rm -f arch/um/Kconfig.arch
+        $(Q)rm -f $(srctree)/arch/um/Kconfig
         $(Q)rm -f $(obj)/config.pot
 
 PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
@@ -168,8 +169,11 @@ conf-objs	:= conf.o  zconf.tab.o
 mconf-objs     := mconf.o zconf.tab.o $(lxdialog)
 nconf-objs     := nconf.o zconf.tab.o nconf.gui.o
 kxgettext-objs  := kxgettext.o zconf.tab.o
+qconf-cxxobjs   := qconf.o
+qconf-objs      := kconfig_load.o zconf.tab.o
+gconf-objs      := gconf.o kconfig_load.o zconf.tab.o
 
-hostprogs-y := conf qconf gconf kxgettext
+hostprogs-y := conf
 
 ifeq ($(MAKECMDGOALS),nconfig)
         hostprogs-y += nconf
@@ -179,6 +183,10 @@ ifeq ($(MAKECMDGOALS),menuconfig)
         hostprogs-y += mconf
 endif
 
+ifeq ($(MAKECMDGOALS),update-po-config)
+        hostprogs-y += kxgettext
+endif
+
 ifeq ($(MAKECMDGOALS),xconfig)
         qconf-target := 1
 endif
@@ -188,16 +196,15 @@ endif
 
 
 ifeq ($(qconf-target),1)
-qconf-cxxobjs   := qconf.o
-qconf-objs      := kconfig_load.o zconf.tab.o
+        hostprogs-y += qconf
 endif
 
 ifeq ($(gconf-target),1)
-gconf-objs      := gconf.o kconfig_load.o zconf.tab.o
+        hostprogs-y += gconf
 endif
 
-clean-files     := lkc_defs.h qconf.moc .tmp_qtcheck \
-                   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
+clean-files     := lkc_defs.h qconf.moc .tmp_qtcheck .tmp_gtkcheck
+clean-files     += zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
 clean-files     += mconf qconf gconf nconf
 clean-files     += config.pot linux.pot
 
@@ -321,11 +328,12 @@ $(obj)/%.moc: $(src)/%.h
         $(KC_QT_MOC) -i $< -o $@
 
 $(obj)/lkc_defs.h: $(src)/lkc_proto.h
-        sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
+        $(Q)sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
 
 # Extract gconf menu items for I18N support
 $(obj)/gconf.glade.h: $(obj)/gconf.glade
-        intltool-extract --type=gettext/glade $(obj)/gconf.glade
+        $(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \
+        $(obj)/gconf.glade
 
 ###
 # The following requires flex/bison/gperf
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 61c35bf2d9cb..2bafd9a7c8da 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -560,8 +560,6 @@ int conf_write(const char *name)
         const char *basename;
         const char *str;
         char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
-        time_t now;
-        int use_timestamp = 1;
         char *env;
 
         dirname[0] = 0;
@@ -598,19 +596,11 @@ int conf_write(const char *name)
         if (!out)
                 return 1;
 
-        time(&now);
-        env = getenv("KCONFIG_NOTIMESTAMP");
-        if (env && *env)
-                use_timestamp = 0;
-
         fprintf(out, _("#\n"
                        "# Automatically generated make config: don't edit\n"
                        "# %s\n"
-                       "%s%s"
                        "#\n"),
-                     rootmenu.prompt->text,
-                     use_timestamp ? "# " : "",
-                     use_timestamp ? ctime(&now) : "");
+                     rootmenu.prompt->text);
 
         if (!conf_get_changed())
                 sym_clear_all_valid();
@@ -784,7 +774,6 @@ int conf_write_autoconf(void)
         const char *str;
         const char *name;
         FILE *out, *tristate, *out_h;
-        time_t now;
         int i;
 
         sym_clear_all_valid();
@@ -811,22 +800,19 @@ int conf_write_autoconf(void)
                 return 1;
         }
 
-        time(&now);
         fprintf(out, "#\n"
                      "# Automatically generated make config: don't edit\n"
                      "# %s\n"
-                     "# %s"
                      "#\n",
-                     rootmenu.prompt->text, ctime(&now));
+                     rootmenu.prompt->text);
         fprintf(tristate, "#\n"
                           "# Automatically generated - do not edit\n"
                           "\n");
         fprintf(out_h, "/*\n"
                        " * Automatically generated C config: don't edit\n"
                        " * %s\n"
-                       " * %s"
                        " */\n",
-                       rootmenu.prompt->text, ctime(&now));
+                       rootmenu.prompt->text);
 
         for_all_symbols(i, sym) {
                 sym_calc_value(sym);
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 3d238db49764..16bfae2d3217 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -20,12 +20,8 @@ struct file {
         struct file *parent;
         const char *name;
         int lineno;
-        int flags;
 };
 
-#define FILE_BUSY               0x0001
-#define FILE_SCANNED            0x0002
-
 typedef enum tristate {
         no, mod, yes
 } tristate;
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 455896164d72..a11d5f7b9eeb 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -253,7 +253,7 @@ void init_left_tree(void)
 
         gtk_tree_view_set_model(view, model1);
         gtk_tree_view_set_headers_visible(view, TRUE);
-        gtk_tree_view_set_rules_hint(view, FALSE);
+        gtk_tree_view_set_rules_hint(view, TRUE);
 
         column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(view, column);
@@ -298,7 +298,7 @@ void init_right_tree(void)
 
         gtk_tree_view_set_model(view, model2);
         gtk_tree_view_set_headers_visible(view, TRUE);
-        gtk_tree_view_set_rules_hint(view, FALSE);
+        gtk_tree_view_set_rules_hint(view, TRUE);
 
         column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(view, column);
@@ -756,7 +756,6 @@ void on_load_clicked(GtkButton * button, gpointer user_data)
 void on_single_clicked(GtkButton * button, gpointer user_data)
 {
         view_mode = SINGLE_VIEW;
-        gtk_paned_set_position(GTK_PANED(hpaned), 0);
         gtk_widget_hide(tree1_w);
         current = &rootmenu;
         display_tree_part();
@@ -782,7 +781,6 @@ void on_split_clicked(GtkButton * button, gpointer user_data)
 void on_full_clicked(GtkButton * button, gpointer user_data)
 {
         view_mode = FULL_VIEW;
-        gtk_paned_set_position(GTK_PANED(hpaned), 0);
         gtk_widget_hide(tree1_w);
         if (tree2)
                 gtk_tree_store_clear(tree2);
@@ -1444,6 +1442,12 @@ static void display_tree(struct menu *menu)
                 if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
                     || (view_mode == FULL_VIEW)
                     || (view_mode == SPLIT_VIEW))*/
+
+                /* Change paned position if the view is not in 'split mode' */
+                if (view_mode == SINGLE_VIEW || view_mode == FULL_VIEW) {
+                        gtk_paned_set_position(GTK_PANED(hpaned), 0);
+                }
+
                 if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))
                     || (view_mode == FULL_VIEW)
                     || (view_mode == SPLIT_VIEW)) {
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
index 6eb039718259..d9182916f724 100644
--- a/scripts/kconfig/lex.zconf.c_shipped
+++ b/scripts/kconfig/lex.zconf.c_shipped
@@ -2363,11 +2363,11 @@ void zconf_initscan(const char *name)
 
         current_file = file_lookup(name);
         current_file->lineno = 1;
-        current_file->flags = FILE_BUSY;
 }
 
 void zconf_nextfile(const char *name)
 {
+        struct file *iter;
         struct file *file = file_lookup(name);
         struct buffer *buf = malloc(sizeof(*buf));
         memset(buf, 0, sizeof(*buf));
@@ -2383,18 +2383,25 @@ void zconf_nextfile(const char *name)
         buf->parent = current_buf;
         current_buf = buf;
 
-        if (file->flags & FILE_BUSY) {
-                printf("%s:%d: do not source '%s' from itself\n",
-                       zconf_curname(), zconf_lineno(), name);
-                exit(1);
-        }
-        if (file->flags & FILE_SCANNED) {
-                printf("%s:%d: file '%s' is already sourced from '%s'\n",
-                       zconf_curname(), zconf_lineno(), name,
-                       file->parent->name);
-                exit(1);
+        for (iter = current_file->parent; iter; iter = iter->parent ) {
+                if (!strcmp(current_file->name,iter->name) ) {
+                        printf("%s:%d: recursive inclusion detected. "
+                               "Inclusion path:\n  current file : '%s'\n",
+                               zconf_curname(), zconf_lineno(),
+                               zconf_curname());
+                        iter = current_file->parent;
+                        while (iter && \
+                               strcmp(iter->name,current_file->name)) {
+                                printf("  included from: '%s:%d'\n",
+                                       iter->name, iter->lineno-1);
+                                iter = iter->parent;
+                        }
+                        if (iter)
+                                printf("  included from: '%s:%d'\n",
+                                       iter->name, iter->lineno+1);
+                        exit(1);
+                }
         }
-        file->flags |= FILE_BUSY;
         file->lineno = 1;
         file->parent = current_file;
         current_file = file;
@@ -2404,8 +2411,6 @@ static void zconf_endfile(void)
 {
         struct buffer *parent;
 
-        current_file->flags |= FILE_SCANNED;
-        current_file->flags &= ~FILE_BUSY;
         current_file = current_file->parent;
 
         parent = current_buf->parent;
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index db56377393d7..488dd7410787 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -373,18 +373,18 @@ static void print_function_line(void)
         const int skip = 1;
 
         for (i = 0; i < function_keys_num; i++) {
-                wattrset(main_window, attributes[FUNCTION_HIGHLIGHT]);
+                (void) wattrset(main_window, attributes[FUNCTION_HIGHLIGHT]);
                 mvwprintw(main_window, LINES-3, offset,
                                 "%s",
                                 function_keys[i].key_str);
-                wattrset(main_window, attributes[FUNCTION_TEXT]);
+                (void) wattrset(main_window, attributes[FUNCTION_TEXT]);
                 offset += strlen(function_keys[i].key_str);
                 mvwprintw(main_window, LINES-3,
                                 offset, "%s",
                                 function_keys[i].func);
                 offset += strlen(function_keys[i].func) + skip;
         }
-        wattrset(main_window, attributes[NORMAL]);
+        (void) wattrset(main_window, attributes[NORMAL]);
 }
 
 /* help */
@@ -953,16 +953,16 @@ static void show_menu(const char *prompt, const char *instructions,
         current_instructions = instructions;
 
         clear();
-        wattrset(main_window, attributes[NORMAL]);
+        (void) wattrset(main_window, attributes[NORMAL]);
         print_in_middle(stdscr, 1, 0, COLS,
                         menu_backtitle,
                         attributes[MAIN_HEADING]);
 
-        wattrset(main_window, attributes[MAIN_MENU_BOX]);
+        (void) wattrset(main_window, attributes[MAIN_MENU_BOX]);
         box(main_window, 0, 0);
-        wattrset(main_window, attributes[MAIN_MENU_HEADING]);
+        (void) wattrset(main_window, attributes[MAIN_MENU_HEADING]);
         mvwprintw(main_window, 0, 3, " %s ", prompt);
-        wattrset(main_window, attributes[NORMAL]);
+        (void) wattrset(main_window, attributes[NORMAL]);
 
         set_menu_items(curses_menu, curses_menu_items);
 
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 06dd2e33581d..c2796b866f8f 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1489,8 +1489,7 @@ void ConfigMainWindow::saveConfigAs(void)
         QString s = Q3FileDialog::getSaveFileName(conf_get_configname(), NULL, this);
         if (s.isNull())
                 return;
-        if (conf_write(QFile::encodeName(s)))
-                QMessageBox::information(this, "qconf", _("Unable to save configuration!"));
+        saveConfig();
 }
 
 void ConfigMainWindow::searchConfig(void)
@@ -1643,7 +1642,7 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e)
         mb.setButtonText(QMessageBox::Cancel, _("Cancel Exit"));
         switch (mb.exec()) {
         case QMessageBox::Yes:
-                conf_write(NULL);
+                saveConfig();
         case QMessageBox::No:
                 e->accept();
                 break;
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 3dbaec185cc4..b22f884f9022 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -294,11 +294,11 @@ void zconf_initscan(const char *name)
 
         current_file = file_lookup(name);
         current_file->lineno = 1;
-        current_file->flags = FILE_BUSY;
 }
 
 void zconf_nextfile(const char *name)
 {
+        struct file *iter;
         struct file *file = file_lookup(name);
         struct buffer *buf = malloc(sizeof(*buf));
         memset(buf, 0, sizeof(*buf));
@@ -314,18 +314,25 @@ void zconf_nextfile(const char *name)
         buf->parent = current_buf;
         current_buf = buf;
 
-        if (file->flags & FILE_BUSY) {
-                printf("%s:%d: do not source '%s' from itself\n",
-                       zconf_curname(), zconf_lineno(), name);
-                exit(1);
-        }
-        if (file->flags & FILE_SCANNED) {
-                printf("%s:%d: file '%s' is already sourced from '%s'\n",
-                       zconf_curname(), zconf_lineno(), name,
-                       file->parent->name);
-                exit(1);
+        for (iter = current_file->parent; iter; iter = iter->parent ) {
+                if (!strcmp(current_file->name,iter->name) ) {
+                        printf("%s:%d: recursive inclusion detected. "
+                               "Inclusion path:\n  current file : '%s'\n",
+                               zconf_curname(), zconf_lineno(),
+                               zconf_curname());
+                        iter = current_file->parent;
+                        while (iter && \
+                               strcmp(iter->name,current_file->name)) {
+                                printf("  included from: '%s:%d'\n",
+                                       iter->name, iter->lineno-1);
+                                iter = iter->parent;
+                        }
+                        if (iter)
+                                printf("  included from: '%s:%d'\n",
+                                       iter->name, iter->lineno+1);
+                        exit(1);
+                }
         }
-        file->flags |= FILE_BUSY;
         file->lineno = 1;
         file->parent = current_file;
         current_file = file;
@@ -335,8 +342,6 @@ static void zconf_endfile(void)
 {
         struct buffer *parent;
 
-        current_file->flags |= FILE_SCANNED;
-        current_file->flags &= ~FILE_BUSY;
         current_file = current_file->parent;
 
         parent = current_buf->parent;