Merge commit 'v2.6.27-rc3' into x86/prototypes

Conflicts:

	include/asm-x86/dma-mapping.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

5 files changed, 222 insertions, 111 deletions

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index fda63136ae68..36b5eedcdc75 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -76,7 +76,6 @@ static void check_stdin(void)
 static int conf_askvalue(struct symbol *sym, const char *def)
 {
         enum symbol_type type = sym_get_type(sym);
-        tristate val;
 
         if (!sym_has_value(sym))
                 printf(_("(NEW) "));
@@ -92,15 +91,6 @@ static int conf_askvalue(struct symbol *sym, const char *def)
         }
 
         switch (input_mode) {
-        case set_no:
-        case set_mod:
-        case set_yes:
-        case set_random:
-                if (sym_has_value(sym)) {
-                        printf("%s\n", def);
-                        return 0;
-                }
-                break;
         case ask_new:
         case ask_silent:
                 if (sym_has_value(sym)) {
@@ -112,9 +102,6 @@ static int conf_askvalue(struct symbol *sym, const char *def)
                 fflush(stdout);
                 fgets(line, 128, stdin);
                 return 1;
-        case set_default:
-                printf("%s\n", def);
-                return 1;
         default:
                 break;
         }
@@ -128,52 +115,6 @@ static int conf_askvalue(struct symbol *sym, const char *def)
         default:
                 ;
         }
-        switch (input_mode) {
-        case set_yes:
-                if (sym_tristate_within_range(sym, yes)) {
-                        line[0] = 'y';
-                        line[1] = '\n';
-                        line[2] = 0;
-                        break;
-                }
-        case set_mod:
-                if (type == S_TRISTATE) {
-                        if (sym_tristate_within_range(sym, mod)) {
-                                line[0] = 'm';
-                                line[1] = '\n';
-                                line[2] = 0;
-                                break;
-                        }
-                } else {
-                        if (sym_tristate_within_range(sym, yes)) {
-                                line[0] = 'y';
-                                line[1] = '\n';
-                                line[2] = 0;
-                                break;
-                        }
-                }
-        case set_no:
-                if (sym_tristate_within_range(sym, no)) {
-                        line[0] = 'n';
-                        line[1] = '\n';
-                        line[2] = 0;
-                        break;
-                }
-        case set_random:
-                do {
-                        val = (tristate)(rand() % 3);
-                } while (!sym_tristate_within_range(sym, val));
-                switch (val) {
-                case no: line[0] = 'n'; break;
-                case mod: line[0] = 'm'; break;
-                case yes: line[0] = 'y'; break;
-                }
-                line[1] = '\n';
-                line[2] = 0;
-                break;
-        default:
-                break;
-        }
         printf("%s", line);
         return 1;
 }
@@ -374,15 +315,7 @@ static int conf_choice(struct menu *menu)
                         else
                                 continue;
                         break;
-                case set_random:
-                        if (is_new)
-                                def = (rand() % cnt) + 1;
-                case set_default:
-                case set_yes:
-                case set_mod:
-                case set_no:
-                        cnt = def;
-                        printf("%d\n", cnt);
+                default:
                         break;
                 }
 
@@ -494,6 +427,43 @@ static void check_conf(struct menu *menu)
                 check_conf(child);
 }
 
+static void conf_do_update(void)
+{
+        /* Update until a loop caused no more changes */
+        do {
+                conf_cnt = 0;
+                check_conf(&rootmenu);
+        } while (conf_cnt);
+}
+
+static int conf_silent_update(void)
+{
+        const char *name;
+
+        if (conf_get_changed()) {
+                name = getenv("KCONFIG_NOSILENTUPDATE");
+                if (name && *name) {
+                        fprintf(stderr,
+                        _("\n*** Kernel configuration requires explicit update.\n\n"));
+                        return 1;
+                }
+                conf_do_update();
+        }
+        return 0;
+}
+
+static int conf_update(void)
+{
+        rootEntry = &rootmenu;
+        conf(&rootmenu);
+        if (input_mode == ask_all) {
+                input_mode = ask_silent;
+                valid_stdin = 1;
+        }
+        conf_do_update();
+        return 0;
+}
+
 int main(int ac, char **av)
 {
         int opt;
@@ -599,36 +569,43 @@ int main(int ac, char **av)
         default:
                 break;
         }
+        switch (input_mode) {
+        case set_no:
+                conf_set_all_new_symbols(def_no);
+                break;
+        case set_yes:
+                conf_set_all_new_symbols(def_yes);
+                break;
+        case set_mod:
+                conf_set_all_new_symbols(def_mod);
+                break;
+        case set_random:
+                conf_set_all_new_symbols(def_random);
+                break;
+        case set_default:
+                conf_set_all_new_symbols(def_default);
+                break;
+        case ask_silent:
+        case ask_new:
+                if (conf_silent_update())
+                        exit(1);
+                break;
+        case ask_all:
+                if (conf_update())
+                        exit(1);
+                break;
+        }
 
-        if (input_mode != ask_silent) {
-                rootEntry = &rootmenu;
-                conf(&rootmenu);
-                if (input_mode == ask_all) {
-                        input_mode = ask_silent;
-                        valid_stdin = 1;
-                }
-        } else if (conf_get_changed()) {
-                name = getenv("KCONFIG_NOSILENTUPDATE");
-                if (name && *name) {
-                        fprintf(stderr, _("\n*** Kernel configuration requires explicit update.\n\n"));
-                        return 1;
-                }
-        } else
-                goto skip_check;
-
-        do {
-                conf_cnt = 0;
-                check_conf(&rootmenu);
-        } while (conf_cnt);
         if (conf_write(NULL)) {
                 fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
-                return 1;
+                exit(1);
         }
-skip_check:
+        /* ask_silent is used during the build so we shall update autoconf.
+         * All other commands are only used to generate a config.
+         */
         if (input_mode == ask_silent && conf_write_autoconf()) {
                 fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
                 return 1;
         }
-
         return 0;
 }
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index ee5fe943d58d..df6a188b9930 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -222,10 +222,8 @@ load:
                                 continue;
                         if (def == S_DEF_USER) {
                                 sym = sym_find(line + 9);
-                                if (!sym) {
-                                        conf_warning("trying to assign nonexistent symbol %s", line + 9);
+                                if (!sym)
                                         break;
-                                }
                         } else {
                                 sym = sym_lookup(line + 9, 0);
                                 if (sym->type == S_UNKNOWN)
@@ -261,10 +259,8 @@ load:
                         }
                         if (def == S_DEF_USER) {
                                 sym = sym_find(line + 7);
-                                if (!sym) {
-                                        conf_warning("trying to assign nonexistent symbol %s", line + 7);
+                                if (!sym)
                                         break;
-                                }
                         } else {
                                 sym = sym_lookup(line + 7, 0);
                                 if (sym->type == S_UNKNOWN)
@@ -812,3 +808,73 @@ void conf_set_changed_callback(void (*fn)(void))
 {
         conf_changed_callback = fn;
 }
+
+
+void conf_set_all_new_symbols(enum conf_def_mode mode)
+{
+        struct symbol *sym, *csym;
+        struct property *prop;
+        struct expr *e;
+        int i, cnt, def;
+
+        for_all_symbols(i, sym) {
+                if (sym_has_value(sym))
+                        continue;
+                switch (sym_get_type(sym)) {
+                case S_BOOLEAN:
+                case S_TRISTATE:
+                        switch (mode) {
+                        case def_yes:
+                                sym->def[S_DEF_USER].tri = yes;
+                                break;
+                        case def_mod:
+                                sym->def[S_DEF_USER].tri = mod;
+                                break;
+                        case def_no:
+                                sym->def[S_DEF_USER].tri = no;
+                                break;
+                        case def_random:
+                                sym->def[S_DEF_USER].tri = (tristate)(rand() % 3);
+                                break;
+                        default:
+                                continue;
+                        }
+                        if (!sym_is_choice(sym) || mode != def_random)
+                                sym->flags |= SYMBOL_DEF_USER;
+                        break;
+                default:
+                        break;
+                }
+
+        }
+
+        if (modules_sym)
+                sym_calc_value(modules_sym);
+
+        if (mode != def_random)
+                return;
+
+        for_all_symbols(i, csym) {
+                if (sym_has_value(csym) || !sym_is_choice(csym))
+                        continue;
+
+                sym_calc_value(csym);
+                prop = sym_get_choice_prop(csym);
+                def = -1;
+                while (1) {
+                        cnt = 0;
+                        expr_list_for_each_sym(prop->expr, e, sym) {
+                                if (sym->visible == no)
+                                        continue;
+                                if (def == cnt++) {
+                                        csym->def[S_DEF_USER].val = sym;
+                                        break;
+                                }
+                        }
+                        if (def >= 0 || cnt < 2)
+                                break;
+                        def = (rand() % cnt) + 1;
+                }
+                csym->flags |= SYMBOL_DEF_USER;
+        }
+}
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
index 6a61cee4a32c..7342ce0a7780 100644
--- a/scripts/kconfig/lex.zconf.c_shipped
+++ b/scripts/kconfig/lex.zconf.c_shipped
@@ -5,10 +5,29 @@
 
 /* A lexical scanner generated by flex */
 
+#define yy_create_buffer zconf_create_buffer
+#define yy_delete_buffer zconf_delete_buffer
+#define yy_flex_debug zconf_flex_debug
+#define yy_init_buffer zconf_init_buffer
+#define yy_flush_buffer zconf_flush_buffer
+#define yy_load_buffer_state zconf_load_buffer_state
+#define yy_switch_to_buffer zconf_switch_to_buffer
+#define yyin zconfin
+#define yyleng zconfleng
+#define yylex zconflex
+#define yylineno zconflineno
+#define yyout zconfout
+#define yyrestart zconfrestart
+#define yytext zconftext
+#define yywrap zconfwrap
+#define yyalloc zconfalloc
+#define yyrealloc zconfrealloc
+#define yyfree zconffree
+
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 33
+#define YY_FLEX_SUBMINOR_VERSION 35
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -30,7 +49,7 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
  * if you want the limit (max/min) macros for int types. 
@@ -53,7 +72,6 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -84,6 +102,8 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -93,11 +113,12 @@ typedef unsigned int flex_uint32_t;
 
 #else   /* ! __cplusplus */
 
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
 
 #define YY_USE_CONST
 
-#endif  /* __STDC__ */
+#endif  /* defined (__STDC__) */
 #endif  /* ! __cplusplus */
 
 #ifdef YY_USE_CONST
@@ -177,14 +198,9 @@ extern FILE *zconfin, *zconfout;
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-
 #ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
-typedef unsigned int yy_size_t;
+typedef size_t yy_size_t;
 #endif
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -335,7 +351,7 @@ void zconffree (void *  );
 
 /* Begin user sect3 */
 
-#define zconfwrap() 1
+#define zconfwrap(n) 1
 #define YY_SKIP_YYWRAP
 
 typedef unsigned char YY_CHAR;
@@ -748,6 +764,7 @@ int zconf_flex_debug = 0;
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *zconftext;
+#define YY_NO_INPUT 1
 
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
@@ -834,6 +851,35 @@ void alloc_string(const char *str, int size)
 
 static int yy_init_globals (void );
 
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int zconflex_destroy (void );
+
+int zconfget_debug (void );
+
+void zconfset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE zconfget_extra (void );
+
+void zconfset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *zconfget_in (void );
+
+void zconfset_in  (FILE * in_str  );
+
+FILE *zconfget_out (void );
+
+void zconfset_out  (FILE * out_str  );
+
+int zconfget_leng (void );
+
+char *zconfget_text (void );
+
+int zconfget_lineno (void );
+
+void zconfset_lineno (int line_number  );
+
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
  */
@@ -876,7 +922,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO (void) fwrite( zconftext, zconfleng, 1, zconfout )
+#define ECHO fwrite( zconftext, zconfleng, 1, zconfout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1540,6 +1586,14 @@ static int yy_get_next_buffer (void)
         else
                 ret_val = EOB_ACT_CONTINUE_SCAN;
 
+        if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+                /* Extend the array by 50%, plus the number we really need. */
+                yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+                YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) zconfrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+                if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+                        YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+        }
+
         (yy_n_chars) += number_to_move;
         YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
         YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
@@ -1926,7 +1980,9 @@ static void zconfensure_buffer_stack (void)
                 (yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc
                                                                 (num_to_alloc * sizeof(struct yy_buffer_state*)
                                                                 );
-                
+                if ( ! (yy_buffer_stack) )
+                        YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" );
+                                                                  
                 memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
                                 
                 (yy_buffer_stack_max) = num_to_alloc;
@@ -1944,6 +2000,8 @@ static void zconfensure_buffer_stack (void)
                                                                 ((yy_buffer_stack),
                                                                 num_to_alloc * sizeof(struct yy_buffer_state*)
                                                                 );
+                if ( ! (yy_buffer_stack) )
+                        YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" );
 
                 /* zero only the new slots.*/
                 memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 96521cb087ec..4a9af6f7886b 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -42,6 +42,14 @@ extern "C" {
 #define TF_PARAM        0x0002
 #define TF_OPTION       0x0004
 
+enum conf_def_mode {
+        def_default,
+        def_yes,
+        def_mod,
+        def_no,
+        def_random
+};
+
 #define T_OPT_MODULES           1
 #define T_OPT_DEFCONFIG_LIST    2
 #define T_OPT_ENV               3
@@ -69,6 +77,7 @@ const char *conf_get_configname(void);
 char *conf_get_default_confname(void);
 void sym_set_change_count(int count);
 void sym_add_change_count(int count);
+void conf_set_all_new_symbols(enum conf_def_mode mode);
 
 /* kconfig_load.c */
 void kconfig_load(void);
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 4cea5c85cd0a..5164ef7ce499 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -1,5 +1,6 @@
 %option backup nostdinit noyywrap never-interactive full ecs
 %option 8bit backup nodefault perf-report perf-report
+%option noinput
 %x COMMAND HELP STRING PARAM
 %{
 /*