Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 81 insertions, 86 deletions

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 515253fe46cf..2bafd9a7c8da 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -5,6 +5,7 @@
 
 #include <sys/stat.h>
 #include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -18,6 +19,9 @@
 static void conf_warning(const char *fmt, ...)
         __attribute__ ((format (printf, 1, 2)));
 
+static void conf_message(const char *fmt, ...)
+        __attribute__ ((format (printf, 1, 2)));
+
 static const char *conf_filename;
 static int conf_lineno, conf_warnings, conf_unsaved;
 
@@ -34,6 +38,29 @@ static void conf_warning(const char *fmt, ...)
         conf_warnings++;
 }
 
+static void conf_default_message_callback(const char *fmt, va_list ap)
+{
+        printf("#\n# ");
+        vprintf(fmt, ap);
+        printf("\n#\n");
+}
+
+static void (*conf_message_callback) (const char *fmt, va_list ap) =
+        conf_default_message_callback;
+void conf_set_message_callback(void (*fn) (const char *fmt, va_list ap))
+{
+        conf_message_callback = fn;
+}
+
+static void conf_message(const char *fmt, ...)
+{
+        va_list ap;
+
+        va_start(ap, fmt);
+        if (conf_message_callback)
+                conf_message_callback(fmt, ap);
+}
+
 const char *conf_get_configname(void)
 {
         char *name = getenv("KCONFIG_CONFIG");
@@ -183,9 +210,8 @@ int conf_read_simple(const char *name, int def)
                         name = conf_expand_value(prop->expr->left.sym->name);
                         in = zconf_fopen(name);
                         if (in) {
-                                printf(_("#\n"
-                                         "# using defaults found in %s\n"
-                                         "#\n"), name);
+                                conf_message(_("using defaults found in %s"),
+                                         name);
                                 goto load;
                         }
                 }
@@ -220,24 +246,23 @@ load:
         while (fgets(line, sizeof(line), in)) {
                 conf_lineno++;
                 sym = NULL;
-                switch (line[0]) {
-                case '#':
-                        if (memcmp(line + 2, "CONFIG_", 7))
+                if (line[0] == '#') {
+                        if (memcmp(line + 2, CONFIG_, strlen(CONFIG_)))
                                 continue;
-                        p = strchr(line + 9, ' ');
+                        p = strchr(line + 2 + strlen(CONFIG_), ' ');
                         if (!p)
                                 continue;
                         *p++ = 0;
                         if (strncmp(p, "is not set", 10))
                                 continue;
                         if (def == S_DEF_USER) {
-                                sym = sym_find(line + 9);
+                                sym = sym_find(line + 2 + strlen(CONFIG_));
                                 if (!sym) {
                                         sym_add_change_count(1);
-                                        break;
+                                        goto setsym;
                                 }
                         } else {
-                                sym = sym_lookup(line + 9, 0);
+                                sym = sym_lookup(line + 2 + strlen(CONFIG_), 0);
                                 if (sym->type == S_UNKNOWN)
                                         sym->type = S_BOOLEAN;
                         }
@@ -253,13 +278,8 @@ load:
                         default:
                                 ;
                         }
-                        break;
-                case 'C':
-                        if (memcmp(line, "CONFIG_", 7)) {
-                                conf_warning("unexpected data");
-                                continue;
-                        }
-                        p = strchr(line + 7, '=');
+                } else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) {
+                        p = strchr(line + strlen(CONFIG_), '=');
                         if (!p)
                                 continue;
                         *p++ = 0;
@@ -270,13 +290,13 @@ load:
                                         *p2 = 0;
                         }
                         if (def == S_DEF_USER) {
-                                sym = sym_find(line + 7);
+                                sym = sym_find(line + strlen(CONFIG_));
                                 if (!sym) {
                                         sym_add_change_count(1);
-                                        break;
+                                        goto setsym;
                                 }
                         } else {
-                                sym = sym_lookup(line + 7, 0);
+                                sym = sym_lookup(line + strlen(CONFIG_), 0);
                                 if (sym->type == S_UNKNOWN)
                                         sym->type = S_OTHER;
                         }
@@ -285,14 +305,12 @@ load:
                         }
                         if (conf_set_sym_val(sym, def, def_flags, p))
                                 continue;
-                        break;
-                case '\r':
-                case '\n':
-                        break;
-                default:
-                        conf_warning("unexpected data");
+                } else {
+                        if (line[0] != '\r' && line[0] != '\n')
+                                conf_warning("unexpected data");
                         continue;
                 }
+setsym:
                 if (sym && sym_is_choice_value(sym)) {
                         struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
                         switch (sym->def[def].tri) {
@@ -405,9 +423,9 @@ static void conf_write_string(bool headerfile, const char *name,
 {
         int l;
         if (headerfile)
-                fprintf(out, "#define CONFIG_%s \"", name);
+                fprintf(out, "#define %s%s \"", CONFIG_, name);
         else
-                fprintf(out, "CONFIG_%s=\"", name);
+                fprintf(out, "%s%s=\"", CONFIG_, name);
 
         while (1) {
                 l = strcspn(str, "\"\\");
@@ -422,24 +440,24 @@ static void conf_write_string(bool headerfile, const char *name,
         fputs("\"\n", out);
 }
 
-static void conf_write_symbol(struct symbol *sym, enum symbol_type type,
-                              FILE *out, bool write_no)
+static void conf_write_symbol(struct symbol *sym, FILE *out, bool write_no)
 {
         const char *str;
 
-        switch (type) {
+        switch (sym->type) {
         case S_BOOLEAN:
         case S_TRISTATE:
                 switch (sym_get_tristate_value(sym)) {
                 case no:
                         if (write_no)
-                                fprintf(out, "# CONFIG_%s is not set\n", sym->name);
+                                fprintf(out, "# %s%s is not set\n",
+                                    CONFIG_, sym->name);
                         break;
                 case mod:
-                        fprintf(out, "CONFIG_%s=m\n", sym->name);
+                        fprintf(out, "%s%s=m\n", CONFIG_, sym->name);
                         break;
                 case yes:
-                        fprintf(out, "CONFIG_%s=y\n", sym->name);
+                        fprintf(out, "%s%s=y\n", CONFIG_, sym->name);
                         break;
                 }
                 break;
@@ -449,7 +467,7 @@ static void conf_write_symbol(struct symbol *sym, enum symbol_type type,
         case S_HEX:
         case S_INT:
                 str = sym_get_string_value(sym);
-                fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
+                fprintf(out, "%s%s=%s\n", CONFIG_, sym->name, str);
                 break;
         case S_OTHER:
         case S_UNKNOWN:
@@ -513,7 +531,7 @@ int conf_write_defconfig(const char *filename)
                                                 goto next_menu;
                                 }
                         }
-                        conf_write_symbol(sym, sym->type, out, true);
+                        conf_write_symbol(sym, out, true);
                 }
 next_menu:
                 if (menu->list != NULL) {
@@ -541,10 +559,7 @@ int conf_write(const char *name)
         struct menu *menu;
         const char *basename;
         const char *str;
-        char dirname[128], tmpname[128], newname[128];
-        enum symbol_type type;
-        time_t now;
-        int use_timestamp = 1;
+        char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
         char *env;
 
         dirname[0] = 0;
@@ -581,21 +596,11 @@ int conf_write(const char *name)
         if (!out)
                 return 1;
 
-        sym = sym_lookup("KERNELVERSION", 0);
-        sym_calc_value(sym);
-        time(&now);
-        env = getenv("KCONFIG_NOTIMESTAMP");
-        if (env && *env)
-                use_timestamp = 0;
-
         fprintf(out, _("#\n"
                        "# Automatically generated make config: don't edit\n"
-                       "# Linux kernel version: %s\n"
-                       "%s%s"
+                       "# %s\n"
                        "#\n"),
-                     sym_get_string_value(sym),
-                     use_timestamp ? "# " : "",
-                     use_timestamp ? ctime(&now) : "");
+                     rootmenu.prompt->text);
 
         if (!conf_get_changed())
                 sym_clear_all_valid();
@@ -616,14 +621,8 @@ int conf_write(const char *name)
                         if (!(sym->flags & SYMBOL_WRITE))
                                 goto next;
                         sym->flags &= ~SYMBOL_WRITE;
-                        type = sym->type;
-                        if (type == S_TRISTATE) {
-                                sym_calc_value(modules_sym);
-                                if (modules_sym->curr.tri == no)
-                                        type = S_BOOLEAN;
-                        }
                         /* Write config symbol to file */
-                        conf_write_symbol(sym, type, out, true);
+                        conf_write_symbol(sym, out, true);
                 }
 
 next:
@@ -650,9 +649,7 @@ next:
                         return 1;
         }
 
-        printf(_("#\n"
-                 "# configuration written to %s\n"
-                 "#\n"), newname);
+        conf_message(_("configuration written to %s"), newname);
 
         sym_set_change_count(0);
 
@@ -662,7 +659,7 @@ next:
 static int conf_split_config(void)
 {
         const char *name;
-        char path[128];
+        char path[PATH_MAX+1];
         char *s, *d, c;
         struct symbol *sym;
         struct stat sb;
@@ -777,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();
@@ -804,25 +800,19 @@ int conf_write_autoconf(void)
                 return 1;
         }
 
-        sym = sym_lookup("KERNELVERSION", 0);
-        sym_calc_value(sym);
-        time(&now);
         fprintf(out, "#\n"
                      "# Automatically generated make config: don't edit\n"
-                     "# Linux kernel version: %s\n"
-                     "# %s"
+                     "# %s\n"
                      "#\n",
-                     sym_get_string_value(sym), 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"
-                       " * Linux kernel version: %s\n"
-                       " * %s"
-                       " */\n"
-                       "#define AUTOCONF_INCLUDED\n",
-                       sym_get_string_value(sym), ctime(&now));
+                       " * %s\n"
+                       " */\n",
+                       rootmenu.prompt->text);
 
         for_all_symbols(i, sym) {
                 sym_calc_value(sym);
@@ -830,7 +820,7 @@ int conf_write_autoconf(void)
                         continue;
 
                 /* write symbol to config file */
-                conf_write_symbol(sym, sym->type, out, false);
+                conf_write_symbol(sym, out, false);
 
                 /* update autoconf and tristate files */
                 switch (sym->type) {
@@ -840,14 +830,17 @@ int conf_write_autoconf(void)
                         case no:
                                 break;
                         case mod:
-                                fprintf(tristate, "CONFIG_%s=M\n", sym->name);
-                                fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name);
+                                fprintf(tristate, "%s%s=M\n",
+                                    CONFIG_, sym->name);
+                                fprintf(out_h, "#define %s%s_MODULE 1\n",
+                                    CONFIG_, sym->name);
                                 break;
                         case yes:
                                 if (sym->type == S_TRISTATE)
-                                        fprintf(tristate, "CONFIG_%s=Y\n",
-                                                        sym->name);
-                                fprintf(out_h, "#define CONFIG_%s 1\n", sym->name);
+                                        fprintf(tristate,"%s%s=Y\n",
+                                            CONFIG_, sym->name);
+                                fprintf(out_h, "#define %s%s 1\n",
+                                    CONFIG_, sym->name);
                                 break;
                         }
                         break;
@@ -857,12 +850,14 @@ int conf_write_autoconf(void)
                 case S_HEX:
                         str = sym_get_string_value(sym);
                         if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
-                                fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str);
+                                fprintf(out_h, "#define %s%s 0x%s\n",
+                                    CONFIG_, sym->name, str);
                                 break;
                         }
                 case S_INT:
                         str = sym_get_string_value(sym);
-                        fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str);
+                        fprintf(out_h, "#define %s%s %s\n",
+                            CONFIG_, sym->name, str);
                         break;
                 default:
                         break;
@@ -928,7 +923,7 @@ static void randomize_choice_values(struct symbol *csym)
         int cnt, def;
 
         /*
-         * If choice is mod then we may have more items slected
+         * If choice is mod then we may have more items selected
          * and if no then no-one.
          * In both cases stop.
          */
@@ -1024,10 +1019,10 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
 
         /*
          * We have different type of choice blocks.
-         * If curr.tri equal to mod then we can select several
+         * If curr.tri equals to mod then we can select several
          * choice symbols in one block.
          * In this case we do nothing.
-         * If curr.tri equal yes then only one symbol can be
+         * If curr.tri equals yes then only one symbol can be
          * selected in a choice block and we set it to yes,
          * and the rest to no.
          */