Merge branch 'linus' into core/iommu

Conflicts:
	arch/x86/Kconfig

10 files changed, 117 insertions, 27 deletions

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index e06365775bdf..979619574f70 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -97,7 +97,7 @@ modname_flags  = $(if $(filter 1,$(words $(modname))),\
                  -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))")
 
 #hash values
-ifdef CONFIG_DYNAMIC_PRINTK_DEBUG
+ifdef CONFIG_DYNAMIC_DEBUG
 debug_flags = -D"DEBUG_HASH=$(shell ./scripts/basic/hash djb2 $(@D)$(modname))"\
               -D"DEBUG_HASH2=$(shell ./scripts/basic/hash r5 $(@D)$(modname))"
 else
@@ -186,3 +186,17 @@ quiet_cmd_gzip = GZIP    $@
 cmd_gzip = gzip -f -9 < $< > $@
 
 
+# Bzip2
+# ---------------------------------------------------------------------------
+
+# Bzip2 does not include size in file... so we have to fake that
+size_append=$(CONFIG_SHELL) $(srctree)/scripts/bin_size
+
+quiet_cmd_bzip2 = BZIP2    $@
+cmd_bzip2 = (bzip2 -9 < $< && $(size_append) $<) > $@ || (rm -f $@ ; false)
+
+# Lzma
+# ---------------------------------------------------------------------------
+
+quiet_cmd_lzma = LZMA    $@
+cmd_lzma = (lzma -9 -c $< && $(size_append) $<) >$@ || (rm -f $@ ; false)
diff --git a/scripts/bin_size b/scripts/bin_size
new file mode 100644
index 000000000000..43e1b360cee6
--- /dev/null
+++ b/scripts/bin_size
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ $# = 0 ] ; then
+   echo Usage: $0 file
+fi
+
+size_dec=`stat -c "%s" $1`
+size_hex_echo_string=`printf "%08x" $size_dec |
+     sed 's/\(..\)\(..\)\(..\)\(..\)/\\\\x\4\\\\x\3\\\\x\2\\\\x\1/g'`
+/bin/echo -ne $size_hex_echo_string
diff --git a/scripts/gcc-x86_32-has-stack-protector.sh b/scripts/gcc-x86_32-has-stack-protector.sh
new file mode 100644
index 000000000000..29493dc4528d
--- /dev/null
+++ b/scripts/gcc-x86_32-has-stack-protector.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo "int foo(void) { char X[200]; return 3; }" | $* -S -xc -c -O0 -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
+if [ "$?" -eq "0" ] ; then
+        echo y
+else
+        echo n
+fi
diff --git a/scripts/gcc-x86_64-has-stack-protector.sh b/scripts/gcc-x86_64-has-stack-protector.sh
index 325c0a1b03b6..afaec618b395 100644
--- a/scripts/gcc-x86_64-has-stack-protector.sh
+++ b/scripts/gcc-x86_64-has-stack-protector.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-echo "int foo(void) { char X[200]; return 3; }" | $1 -S -xc -c -O0 -mcmodel=kernel -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
+echo "int foo(void) { char X[200]; return 3; }" | $* -S -xc -c -O0 -mcmodel=kernel -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
 if [ "$?" -eq "0" ] ; then
-        echo $2
+        echo y
+else
+        echo n
 fi
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
index 5f3415f28736..3eea8f15131b 100644
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -5,7 +5,7 @@
 # Released under the terms of the GNU GPL
 #
 # Generate a cpio packed initramfs. It uses gen_init_cpio to generate
-# the cpio archive, and gzip to pack it.
+# the cpio archive, and then compresses it.
 # The script may also be used to generate the inputfile used for gen_init_cpio
 # This script assumes that gen_init_cpio is located in usr/ directory
 
@@ -16,8 +16,8 @@ usage() {
 cat << EOF
 Usage:
 $0 [-o <file>] [-u <uid>] [-g <gid>] {-d | <cpio_source>} ...
-        -o <file>      Create gzipped initramfs file named <file> using
-                       gen_init_cpio and gzip
+        -o <file>      Create compressed initramfs file named <file> using
+                       gen_init_cpio and compressor depending on the extension
         -u <uid>       User ID to map to user ID 0 (root).
                        <uid> is only meaningful if <cpio_source> is a
                        directory.  "squash" forces all files to uid 0.
@@ -225,6 +225,7 @@ cpio_list=
 output="/dev/stdout"
 output_file=""
 is_cpio_compressed=
+compr="gzip -9 -f"
 
 arg="$1"
 case "$arg" in
@@ -233,11 +234,15 @@ case "$arg" in
                 echo "deps_initramfs := \\"
                 shift
                 ;;
-        "-o")   # generate gzipped cpio image named $1
+        "-o")   # generate compressed cpio image named $1
                 shift
                 output_file="$1"
                 cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
                 output=${cpio_list}
+                echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
+                echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
+                echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
+                echo "$output_file" | grep -q "\.cpio$" && compr="cat"
                 shift
                 ;;
 esac
@@ -274,7 +279,7 @@ while [ $# -gt 0 ]; do
         esac
 done
 
-# If output_file is set we will generate cpio archive and gzip it
+# If output_file is set we will generate cpio archive and compress it
 # we are carefull to delete tmp files
 if [ ! -z ${output_file} ]; then
         if [ -z ${cpio_file} ]; then
@@ -287,7 +292,8 @@ if [ ! -z ${output_file} ]; then
         if [ "${is_cpio_compressed}" = "compressed" ]; then
                 cat ${cpio_tfile} > ${output_file}
         else
-                cat ${cpio_tfile} | gzip -f -9 - > ${output_file}
+                (cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
+                || (rm -f ${output_file} ; false)
         fi
         [ -z ${cpio_file} ] && rm ${cpio_tfile}
 fi
diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl
index db30fac3083e..56f90a480899 100644
--- a/scripts/headers_check.pl
+++ b/scripts/headers_check.pl
@@ -38,7 +38,7 @@ foreach my $file (@files) {
                 &check_asm_types();
                 &check_sizetypes();
                 &check_prototypes();
-                &check_config();
+                # Dropped for now. Too much noise &check_config();
         }
         close FH;
 }
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 3e1057f885c6..d190092c3b6e 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -11,6 +11,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 
 #define LKC_DIRECT_LINK
 #include "lkc.h"
@@ -464,9 +465,22 @@ int main(int ac, char **av)
                         input_mode = set_yes;
                         break;
                 case 'r':
+                {
+                        struct timeval now;
+                        unsigned int seed;
+
+                        /*
+                         * 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));
+                        srand(seed);
+
                         input_mode = set_random;
-                        srand(time(NULL));
                         break;
+                }
                 case 'h':
                         printf(_("See README for usage info\n"));
                         exit(0);
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 830d9eae11f9..273d73888f9d 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -843,7 +843,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
                         default:
                                 continue;
                         }
-                        if (!sym_is_choice(sym) || mode != def_random)
+                        if (!(sym_is_choice(sym) && mode == def_random))
                                 sym->flags |= SYMBOL_DEF_USER;
                         break;
                 default:
@@ -856,28 +856,49 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
 
         if (mode != def_random)
                 return;
-
+        /*
+         * We have different type of choice blocks.
+         * If curr.tri equal 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
+         * selected in a choice block and we set it to yes,
+         * and the rest to no.
+         */
         for_all_symbols(i, csym) {
                 if (sym_has_value(csym) || !sym_is_choice(csym))
                         continue;
 
                 sym_calc_value(csym);
+
+                if (csym->curr.tri != yes)
+                        continue;
+
                 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;
-                                }
+
+                /* count entries in choice block */
+                cnt = 0;
+                expr_list_for_each_sym(prop->expr, e, sym)
+                        cnt++;
+
+                /*
+                 * find a random value and set it to yes,
+                 * set the rest to no so we have only one set
+                 */
+                def = (rand() % cnt);
+
+                cnt = 0;
+                expr_list_for_each_sym(prop->expr, e, sym) {
+                        if (def == cnt++) {
+                                sym->def[S_DEF_USER].tri = yes;
+                                csym->def[S_DEF_USER].val = sym;
+                        }
+                        else {
+                                sym->def[S_DEF_USER].tri = no;
                         }
-                        if (def >= 0 || cnt < 2)
-                                break;
-                        def = (rand() % cnt) + 1;
                 }
                 csym->flags |= SYMBOL_DEF_USER;
+                /* clear VALID to get value calculated */
+                csym->flags &= ~(SYMBOL_VALID);
         }
 }
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 4eea60b1693e..a3344285ccf4 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -710,6 +710,14 @@ static int do_dmi_entry(const char *filename, struct dmi_system_id *id,
         strcat(alias, ":");
         return 1;
 }
+
+static int do_platform_entry(const char *filename,
+                             struct platform_device_id *id, char *alias)
+{
+        sprintf(alias, PLATFORM_MODULE_PREFIX "%s", id->name);
+        return 1;
+}
+
 /* Ignore any prefix, eg. some architectures prepend _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
@@ -849,6 +857,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct dmi_system_id), "dmi",
                          do_dmi_entry, mod);
+        else if (sym_is(symname, "__mod_platform_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct platform_device_id), "platform",
+                         do_platform_entry, mod);
         free(zeros);
 }
 
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 88921611b22e..7e62303133dc 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -415,8 +415,9 @@ static int parse_elf(struct elf_info *info, const char *filename)
                 const char *secstrings
                         = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
                 const char *secname;
+                int nobits = sechdrs[i].sh_type == SHT_NOBITS;
 
-                if (sechdrs[i].sh_offset > info->size) {
+                if (!nobits && sechdrs[i].sh_offset > info->size) {
                         fatal("%s is truncated. sechdrs[i].sh_offset=%lu > "
                               "sizeof(*hrd)=%zu\n", filename,
                               (unsigned long)sechdrs[i].sh_offset,
@@ -425,6 +426,8 @@ static int parse_elf(struct elf_info *info, const char *filename)
                 }
                 secname = secstrings + sechdrs[i].sh_name;
                 if (strcmp(secname, ".modinfo") == 0) {
+                        if (nobits)
+                                fatal("%s has NOBITS .modinfo\n", filename);
                         info->modinfo = (void *)hdr + sechdrs[i].sh_offset;
                         info->modinfo_len = sechdrs[i].sh_size;
                 } else if (strcmp(secname, "__ksymtab") == 0)