8 files changed, 44 insertions, 6 deletions

diff --git a/scripts/.gitignore b/scripts/.gitignore
index b939fbd01195..52cab46ae35a 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -7,3 +7,4 @@ pnmtologo
 bin2c
 unifdef
 binoffset
+ihex2fw
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 2b706617c89a..7a7778746ea6 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -116,6 +116,17 @@ _a_flags       = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \
                  $(asflags-y) $(AFLAGS_$(basetarget).o)
 _cpp_flags     = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F))
 
+#
+# Enable gcov profiling flags for a file, directory or for all files depending
+# on variables GCOV_PROFILE_obj.o, GCOV_PROFILE and CONFIG_GCOV_PROFILE_ALL
+# (in this order)
+#
+ifeq ($(CONFIG_GCOV_KERNEL),y)
+_c_flags += $(if $(patsubst n%,, \
+                $(GCOV_PROFILE_$(basetarget).o)$(GCOV_PROFILE)$(CONFIG_GCOV_PROFILE_ALL)), \
+                $(CFLAGS_GCOV))
+endif
+
 # If building the kernel in a separate objtree expand all occurrences
 # of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/').
 
diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
index 4c9523ef9c00..99ca7a698687 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -385,7 +385,7 @@ int main(int argc, char *argv[])
         if (!srctree)
                 srctree = getcwd(NULL, 0);
         kernsrctree = getenv("KBUILD_SRC");
-        if (!kernsrctree)
+        if (!kernsrctree || !*kernsrctree)
                 kernsrctree = srctree;
         if (argc != 3) {
                 usage();
diff --git a/scripts/dtc/.gitignore b/scripts/dtc/.gitignore
new file mode 100644
index 000000000000..095acb49a374
--- /dev/null
+++ b/scripts/dtc/.gitignore
@@ -0,0 +1,5 @@
+dtc
+dtc-lexer.lex.c
+dtc-parser.tab.c
+dtc-parser.tab.h
+
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 3cb57895c9ea..64343cc084b4 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -167,11 +167,11 @@ static int symbol_valid_tr(struct sym_entry *s)
         for (i = 0; i < ARRAY_SIZE(text_ranges); ++i) {
                 tr = &text_ranges[i];
 
-                if (s->addr >= tr->start && s->addr < tr->end)
-                        return 0;
+                if (s->addr >= tr->start && s->addr <= tr->end)
+                        return 1;
         }
 
-        return 1;
+        return 0;
 }
 
 static int symbol_valid(struct sym_entry *s)
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index a193fa3f5272..b52d340d759d 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1426,6 +1426,8 @@ sub dump_struct($$) {
         # strip comments:
         $members =~ s/\/\*.*?\*\///gos;
         $nested =~ s/\/\*.*?\*\///gos;
+        # strip kmemcheck_bitfield_{begin,end}.*;
+        $members =~ s/kmemcheck_bitfield_.*?;//gos;
 
         create_parameterlist($members, ';', $file);
         check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested);
@@ -1651,6 +1653,15 @@ sub push_parameter($$$) {
         }
         }
 
+        # strip spaces from $param so that it is one continous string
+        # on @parameterlist;
+        # this fixes a problem where check_sections() cannot find
+        # a parameter like "addr[6 + 2]" because it actually appears
+        # as "addr[6", "+", "2]" on the parameter list;
+        # but it's better to maintain the param string unchanged for output,
+        # so just weaken the string compare in check_sections() to ignore
+        # "[blah" in a parameter string;
+        ###$param =~ s/\s*//g;
         push @parameterlist, $param;
         $parametertypes{$param} = $type;
 }
@@ -1669,6 +1680,14 @@ sub check_sections($$$$$$) {
                         $prm_clean = $prms[$px];
                         $prm_clean =~ s/\[.*\]//;
                         $prm_clean =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//;
+                        # ignore array size in a parameter string;
+                        # however, the original param string may contain
+                        # spaces, e.g.:  addr[6 + 2]
+                        # and this appears in @prms as "addr[6" since the
+                        # parameter list is split at spaces;
+                        # hence just ignore "[..." for the sections check;
+                        $prm_clean =~ s/\[.*//;
+
                         ##$prm_clean =~ s/^\**//;
                         if ($prm_clean eq $sects[$sx]) {
                                 $err = 0;
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 01c2d13dd020..b19f1f4962e3 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -16,6 +16,8 @@ create_package() {
         local pname="$1" pdir="$2"
 
         cp debian/copyright "$pdir/usr/share/doc/$pname/"
+        cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian"
+        gzip -9 "$pdir/usr/share/doc/$pname/changelog.Debian"
 
         # Fix ownership and permissions
         chown -R root:root "$pdir"
diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
index 64f5ddb09ea6..5c113123ed9f 100644
--- a/scripts/pnmtologo.c
+++ b/scripts/pnmtologo.c
@@ -237,7 +237,7 @@ static void write_header(void)
     fprintf(out, " *  Linux logo %s\n", logoname);
     fputs(" */\n\n", out);
     fputs("#include <linux/linux_logo.h>\n\n", out);
-    fprintf(out, "static const unsigned char %s_data[] __initconst = {\n",
+    fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
             logoname);
 }
 
@@ -374,7 +374,7 @@ static void write_logo_clut224(void)
     fputs("\n};\n\n", out);
 
     /* write logo clut */
-    fprintf(out, "static const unsigned char %s_clut[] __initconst = {\n",
+    fprintf(out, "static unsigned char %s_clut[] __initdata = {\n",
             logoname);
     write_hex_cnt = 0;
     for (i = 0; i < logo_clutsize; i++) {