9 files changed, 206 insertions, 61 deletions

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 649ce6844033..01df30af4d4a 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -234,8 +234,9 @@ sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH
         "$(if $(part-of-module),1,0)" "$(@)";
 recordmcount_source := $(srctree)/scripts/recordmcount.pl
 endif
-cmd_record_mcount =                                             \
-        if [ "$(findstring -pg,$(_c_flags))" = "-pg" ]; then    \
+cmd_record_mcount =                                             \
+        if [ "$(findstring $(CC_FLAGS_FTRACE),$(_c_flags))" =   \
+             "$(CC_FLAGS_FTRACE)" ]; then                       \
                 $(sub_cmd_record_mcount)                        \
         fi;
 endif
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
index 1bca180db8ad..627f8cbbedb8 100644
--- a/scripts/Makefile.clean
+++ b/scripts/Makefile.clean
@@ -42,19 +42,19 @@ __clean-files	:= $(extra-y) $(extra-m) $(extra-)       \
 
 __clean-files   := $(filter-out $(no-clean-files), $(__clean-files))
 
-# as clean-files is given relative to the current directory, this adds
-# a $(obj) prefix, except for absolute paths
+# clean-files is given relative to the current directory, unless it
+# starts with $(objtree)/ (which means "./", so do not add "./" unless
+# you want to delete a file from the toplevel object directory).
 
 __clean-files   := $(wildcard                                               \
-                   $(addprefix $(obj)/, $(filter-out /%, $(__clean-files))) \
-                   $(filter /%, $(__clean-files)))
+                   $(addprefix $(obj)/, $(filter-out $(objtree)/%, $(__clean-files))) \
+                   $(filter $(objtree)/%, $(__clean-files)))
 
-# as clean-dirs is given relative to the current directory, this adds
-# a $(obj) prefix, except for absolute paths
+# same as clean-files
 
 __clean-dirs    := $(wildcard                                               \
-                   $(addprefix $(obj)/, $(filter-out /%, $(clean-dirs)))    \
-                   $(filter /%, $(clean-dirs)))
+                   $(addprefix $(obj)/, $(filter-out $(objtree)/%, $(clean-dirs)))    \
+                   $(filter $(objtree)/%, $(clean-dirs)))
 
 # ==========================================================================
 
diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan
new file mode 100644
index 000000000000..631619b2b118
--- /dev/null
+++ b/scripts/Makefile.kasan
@@ -0,0 +1,25 @@
+ifdef CONFIG_KASAN
+ifdef CONFIG_KASAN_INLINE
+        call_threshold := 10000
+else
+        call_threshold := 0
+endif
+
+CFLAGS_KASAN_MINIMAL := -fsanitize=kernel-address
+
+CFLAGS_KASAN := $(call cc-option, -fsanitize=kernel-address \
+                -fasan-shadow-offset=$(CONFIG_KASAN_SHADOW_OFFSET) \
+                --param asan-stack=1 --param asan-globals=1 \
+                --param asan-instrumentation-with-call-threshold=$(call_threshold))
+
+ifeq ($(call cc-option, $(CFLAGS_KASAN_MINIMAL) -Werror),)
+        $(warning Cannot use CONFIG_KASAN: \
+            -fsanitize=kernel-address is not supported by compiler)
+else
+    ifeq ($(CFLAGS_KASAN),)
+        $(warning CONFIG_KASAN: compiler does not support all options.\
+            Trying minimal configuration)
+        CFLAGS_KASAN := $(CFLAGS_KASAN_MINIMAL)
+    endif
+endif
+endif
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 511755200634..044eb4f89a91 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -119,6 +119,16 @@ _c_flags += $(if $(patsubst n%,, \
                 $(CFLAGS_GCOV))
 endif
 
+#
+# Enable address sanitizer flags for kernel except some files or directories
+# we don't want to check (depends on variables KASAN_SANITIZE_obj.o, KASAN_SANITIZE)
+#
+ifeq ($(CONFIG_KASAN),y)
+_c_flags += $(if $(patsubst n%,, \
+                $(KASAN_SANITIZE_$(basetarget).o)$(KASAN_SANITIZE)y), \
+                $(CFLAGS_KASAN))
+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/asn1_compiler.c b/scripts/asn1_compiler.c
index 91c4117637ae..7750e9c31483 100644
--- a/scripts/asn1_compiler.c
+++ b/scripts/asn1_compiler.c
@@ -311,6 +311,9 @@ struct token {
 
 static struct token *token_list;
 static unsigned nr_tokens;
+static _Bool verbose;
+
+#define debug(fmt, ...) do { if (verbose) printf(fmt, ## __VA_ARGS__); } while (0)
 
 static int directive_compare(const void *_key, const void *_pdir)
 {
@@ -322,21 +325,21 @@ static int directive_compare(const void *_key, const void *_pdir)
         dlen = strlen(dir);
         clen = (dlen < token->size) ? dlen : token->size;
 
-        //printf("cmp(%*.*s,%s) = ",
+        //debug("cmp(%*.*s,%s) = ",
         //       (int)token->size, (int)token->size, token->value,
         //       dir);
 
         val = memcmp(token->value, dir, clen);
         if (val != 0) {
-                //printf("%d [cmp]\n", val);
+                //debug("%d [cmp]\n", val);
                 return val;
         }
 
         if (dlen == token->size) {
-                //printf("0\n");
+                //debug("0\n");
                 return 0;
         }
-        //printf("%d\n", (int)dlen - (int)token->size);
+        //debug("%d\n", (int)dlen - (int)token->size);
         return dlen - token->size; /* shorter -> negative */
 }
 
@@ -515,13 +518,13 @@ static void tokenise(char *buffer, char *end)
         }
 
         nr_tokens = tix;
-        printf("Extracted %u tokens\n", nr_tokens);
+        debug("Extracted %u tokens\n", nr_tokens);
 
 #if 0
         {
                 int n;
                 for (n = 0; n < nr_tokens; n++)
-                        printf("Token %3u: '%*.*s'\n",
+                        debug("Token %3u: '%*.*s'\n",
                                n,
                                (int)token_list[n].size, (int)token_list[n].size,
                                token_list[n].value);
@@ -542,6 +545,7 @@ int main(int argc, char **argv)
         ssize_t readlen;
         FILE *out, *hdr;
         char *buffer, *p;
+        char *kbuild_verbose;
         int fd;
 
         if (argc != 4) {
@@ -550,6 +554,10 @@ int main(int argc, char **argv)
                 exit(2);
         }
 
+        kbuild_verbose = getenv("KBUILD_VERBOSE");
+        if (kbuild_verbose)
+                verbose = atoi(kbuild_verbose);
+
         filename = argv[1];
         outputname = argv[2];
         headername = argv[3];
@@ -748,11 +756,11 @@ static void build_type_list(void)
 
         qsort(type_index, nr, sizeof(type_index[0]), type_index_compare);
 
-        printf("Extracted %u types\n", nr_types);
+        debug("Extracted %u types\n", nr_types);
 #if 0
         for (n = 0; n < nr_types; n++) {
                 struct type *type = type_index[n];
-                printf("- %*.*s\n",
+                debug("- %*.*s\n",
                        (int)type->name->size,
                        (int)type->name->size,
                        type->name->value);
@@ -793,7 +801,7 @@ static void parse(void)
 
         } while (type++, !(type->flags & TYPE_STOP_MARKER));
 
-        printf("Extracted %u actions\n", nr_actions);
+        debug("Extracted %u actions\n", nr_actions);
 }
 
 static struct element *element_list;
@@ -1284,7 +1292,7 @@ static void render(FILE *out, FILE *hdr)
         }
 
         /* We do two passes - the first one calculates all the offsets */
-        printf("Pass 1\n");
+        debug("Pass 1\n");
         nr_entries = 0;
         root = &type_list[0];
         render_element(NULL, root->element, NULL);
@@ -1295,7 +1303,7 @@ static void render(FILE *out, FILE *hdr)
                 e->flags &= ~ELEMENT_RENDERED;
 
         /* And then we actually render */
-        printf("Pass 2\n");
+        debug("Pass 2\n");
         fprintf(out, "\n");
         fprintf(out, "static const unsigned char %s_machine[] = {\n",
                 grammar_name);
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index f0bb6d60c07b..d12435992dea 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -278,6 +278,7 @@ our $Attribute	= qr{
                         __noreturn|
                         __used|
                         __cold|
+                        __pure|
                         __noclone|
                         __deprecated|
                         __read_mostly|
@@ -298,6 +299,7 @@ our $Binary	= qr{(?i)0b[01]+$Int_type?};
 our $Hex        = qr{(?i)0x[0-9a-f]+$Int_type?};
 our $Int        = qr{[0-9]+$Int_type?};
 our $Octal      = qr{0[0-7]+$Int_type?};
+our $String     = qr{"[X\t]*"};
 our $Float_hex  = qr{(?i)0x[0-9a-f]+p-?[0-9]+[fl]?};
 our $Float_dec  = qr{(?i)(?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?};
 our $Float_int  = qr{(?i)[0-9]+e-?[0-9]+[fl]?};
@@ -337,6 +339,11 @@ our $UTF8	= qr{
         | $NON_ASCII_UTF8
 }x;
 
+our $typeOtherOSTypedefs = qr{(?x:
+        u_(?:char|short|int|long) |          # bsd
+        u(?:nchar|short|int|long)            # sysv
+)};
+
 our $typeTypedefs = qr{(?x:
         (?:__)?(?:u|s|be|le)(?:8|16|32|64)|
         atomic_t
@@ -473,6 +480,7 @@ sub build_types {
                         (?:$Modifier\s+|const\s+)*
                         (?:
                                 (?:typeof|__typeof__)\s*\([^\)]*\)|
+                                (?:$typeOtherOSTypedefs\b)|
                                 (?:$typeTypedefs\b)|
                                 (?:${all}\b)
                         )
@@ -490,6 +498,7 @@ sub build_types {
                         (?:
                                 (?:typeof|__typeof__)\s*\([^\)]*\)|
                                 (?:$typeTypedefs\b)|
+                                (?:$typeOtherOSTypedefs\b)|
                                 (?:${allWithAttr}\b)
                         )
                         (?:\s+$Modifier|\s+const)*
@@ -517,7 +526,7 @@ our $Typecast	= qr{\s*(\(\s*$NonptrType\s*\)){0,1}\s*};
 
 our $balanced_parens = qr/(\((?:[^\(\)]++|(?-1))*\))/;
 our $LvalOrFunc = qr{((?:[\&\*]\s*)?$Lval)\s*($balanced_parens{0,1})\s*};
-our $FuncArg = qr{$Typecast{0,1}($LvalOrFunc|$Constant)};
+our $FuncArg = qr{$Typecast{0,1}($LvalOrFunc|$Constant|$String)};
 
 our $declaration_macros = qr{(?x:
         (?:$Storage\s+)?(?:[A-Z_][A-Z0-9]*_){0,2}(?:DEFINE|DECLARE)(?:_[A-Z0-9]+){1,2}\s*\(|
@@ -632,6 +641,8 @@ sub git_commit_info {
         $output =~ s/^\s*//gm;
         my @lines = split("\n", $output);
 
+        return ($id, $desc) if ($#lines < 0);
+
         if ($lines[0] =~ /^error: short SHA1 $commit is ambiguous\./) {
 # Maybe one day convert this block of bash into something that returns
 # all matching commit ids, but it's very slow...
@@ -2159,6 +2170,13 @@ sub process {
                         }
                 }
 
+# Check email subject for common tools that don't need to be mentioned
+                if ($in_header_lines &&
+                    $line =~ /^Subject:.*\b(?:checkpatch|sparse|smatch)\b[^:]/i) {
+                        WARN("EMAIL_SUBJECT",
+                             "A patch subject line should describe the change not the tool that found it\n" . $herecurr);
+                }
+
 # Check for old stable address
                 if ($line =~ /^\s*cc:\s*.*<?\bstable\@kernel\.org\b>?.*$/i) {
                         ERROR("STABLE_ADDRESS",
@@ -2171,21 +2189,49 @@ sub process {
                               "Remove Gerrit Change-Id's before submitting upstream.\n" . $herecurr);
                 }
 
-# Check for improperly formed commit descriptions
-                if ($in_commit_log &&
-                    $line =~ /\bcommit\s+[0-9a-f]{5,}/i &&
-                    !($line =~ /\b[Cc]ommit [0-9a-f]{12,40} \("/ ||
-                      ($line =~ /\b[Cc]ommit [0-9a-f]{12,40}\s*$/ &&
-                       defined $rawlines[$linenr] &&
-                       $rawlines[$linenr] =~ /^\s*\("/))) {
-                        $line =~ /\b(c)ommit\s+([0-9a-f]{5,})/i;
+# Check for git id commit length and improperly formed commit descriptions
+                if ($in_commit_log && $line =~ /\b(c)ommit\s+([0-9a-f]{5,})/i) {
                         my $init_char = $1;
                         my $orig_commit = lc($2);
-                        my $id = '01234567890ab';
-                        my $desc = 'commit description';
-                        ($id, $desc) = git_commit_info($orig_commit, $id, $desc);
-                        ERROR("GIT_COMMIT_ID",
-                              "Please use 12 or more chars for the git commit ID like: '${init_char}ommit $id (\"$desc\")'\n" . $herecurr);
+                        my $short = 1;
+                        my $long = 0;
+                        my $case = 1;
+                        my $space = 1;
+                        my $hasdesc = 0;
+                        my $hasparens = 0;
+                        my $id = '0123456789ab';
+                        my $orig_desc = "commit description";
+                        my $description = "";
+
+                        $short = 0 if ($line =~ /\bcommit\s+[0-9a-f]{12,40}/i);
+                        $long = 1 if ($line =~ /\bcommit\s+[0-9a-f]{41,}/i);
+                        $space = 0 if ($line =~ /\bcommit [0-9a-f]/i);
+                        $case = 0 if ($line =~ /\b[Cc]ommit\s+[0-9a-f]{5,40}[^A-F]/);
+                        if ($line =~ /\bcommit\s+[0-9a-f]{5,}\s+\("([^"]+)"\)/i) {
+                                $orig_desc = $1;
+                                $hasparens = 1;
+                        } elsif ($line =~ /\bcommit\s+[0-9a-f]{5,}\s*$/i &&
+                                 defined $rawlines[$linenr] &&
+                                 $rawlines[$linenr] =~ /^\s*\("([^"]+)"\)/) {
+                                $orig_desc = $1;
+                                $hasparens = 1;
+                        } elsif ($line =~ /\bcommit\s+[0-9a-f]{5,}\s+\("[^"]+$/i &&
+                                 defined $rawlines[$linenr] &&
+                                 $rawlines[$linenr] =~ /^\s*[^"]+"\)/) {
+                                $line =~ /\bcommit\s+[0-9a-f]{5,}\s+\("([^"]+)$/i;
+                                $orig_desc = $1;
+                                $rawlines[$linenr] =~ /^\s*([^"]+)"\)/;
+                                $orig_desc .= " " . $1;
+                                $hasparens = 1;
+                        }
+
+                        ($id, $description) = git_commit_info($orig_commit,
+                                                              $id, $orig_desc);
+
+                        if ($short || $long || $space || $case || ($orig_desc ne $description) || !$hasparens) {
+                                ERROR("GIT_COMMIT_ID",
+                                      "Please use git commit description style 'commit <12+ chars of sha1> (\"<title line>\")' - ie: '${init_char}ommit $id (\"$description\")'\n" . $herecurr);
+                        }
                 }
 
 # Check for added, moved or deleted files
@@ -2355,6 +2401,13 @@ sub process {
                              "Use of CONFIG_EXPERIMENTAL is deprecated. For alternatives, see https://lkml.org/lkml/2012/10/23/580\n");
                 }
 
+# discourage the use of boolean for type definition attributes of Kconfig options
+                if ($realfile =~ /Kconfig/ &&
+                    $line =~ /^\+\s*\bboolean\b/) {
+                        WARN("CONFIG_TYPE_BOOLEAN",
+                             "Use of boolean is deprecated, please use bool instead.\n" . $herecurr);
+                }
+
                 if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&
                     ($line =~ /\+(EXTRA_[A-Z]+FLAGS).*/)) {
                         my $flag = $1;
@@ -2499,7 +2552,7 @@ sub process {
                         }
                 }
 
-                if ($line =~ /^\+.*(\w+\s*)?\(\s*$Type\s*\)[ \t]+(?!$Assignment|$Arithmetic|[,;\({\[\<\>])/ &&
+                if ($line =~ /^\+.*(\w+\s*)?\(\s*$Type\s*\)[ \t]+(?!$Assignment|$Arithmetic|[,;:\?\(\{\}\[\<\>]|&&|\|\||\\$)/ &&
                     (!defined($1) || $1 !~ /sizeof\s*/)) {
                         if (CHK("SPACING",
                                 "No space is necessary after a cast\n" . $herecurr) &&
@@ -3124,6 +3177,7 @@ sub process {
                     $line !~ /\btypedef\s+$Type\s*\(\s*\*?$Ident\s*\)\s*\(/ &&
                     $line !~ /\btypedef\s+$Type\s+$Ident\s*\(/ &&
                     $line !~ /\b$typeTypedefs\b/ &&
+                    $line !~ /\b$typeOtherOSTypedefs\b/ &&
                     $line !~ /\b__bitwise(?:__|)\b/) {
                         WARN("NEW_TYPEDEFS",
                              "do not add new typedefs\n" . $herecurr);
@@ -3200,7 +3254,7 @@ sub process {
 # check for uses of printk_ratelimit
                 if ($line =~ /\bprintk_ratelimit\s*\(/) {
                         WARN("PRINTK_RATELIMITED",
-"Prefer printk_ratelimited or pr_<level>_ratelimited to printk_ratelimit\n" . $herecurr);
+                             "Prefer printk_ratelimited or pr_<level>_ratelimited to printk_ratelimit\n" . $herecurr);
                 }
 
 # printk should use KERN_* levels.  Note that follow on printk's on the
@@ -3646,7 +3700,22 @@ sub process {
                                          $op eq '*' or $op eq '/' or
                                          $op eq '%')
                                 {
-                                        if ($ctx =~ /Wx[^WCE]|[^WCE]xW/) {
+                                        if ($check) {
+                                                if (defined $fix_elements[$n + 2] && $ctx !~ /[EW]x[EW]/) {
+                                                        if (CHK("SPACING",
+                                                                "spaces preferred around that '$op' $at\n" . $hereptr)) {
+                                                                $good = rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
+                                                                $fix_elements[$n + 2] =~ s/^\s+//;
+                                                                $line_fixed = 1;
+                                                        }
+                                                } elsif (!defined $fix_elements[$n + 2] && $ctx !~ /Wx[OE]/) {
+                                                        if (CHK("SPACING",
+                                                                "space preferred before that '$op' $at\n" . $hereptr)) {
+                                                                $good = rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]);
+                                                                $line_fixed = 1;
+                                                        }
+                                                }
+                                        } elsif ($ctx =~ /Wx[^WCE]|[^WCE]xW/) {
                                                 if (ERROR("SPACING",
                                                           "need consistent spacing around '$op' $at\n" . $hereptr)) {
                                                         $good = rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
@@ -4251,6 +4320,7 @@ sub process {
                         $ctx = $dstat;
 
                         $dstat =~ s/\\\n.//g;
+                        $dstat =~ s/$;/ /g;
 
                         if ($dstat =~ /^\+\s*#\s*define\s+$Ident\s*${balanced_parens}\s*do\s*{(.*)\s*}\s*while\s*\(\s*0\s*\)\s*([;\s]*)\s*$/) {
                                 my $stmts = $2;
@@ -4417,12 +4487,18 @@ sub process {
 
 # check for unnecessary blank lines around braces
                 if (($line =~ /^.\s*}\s*$/ && $prevrawline =~ /^.\s*$/)) {
-                        CHK("BRACES",
-                            "Blank lines aren't necessary before a close brace '}'\n" . $hereprev);
+                        if (CHK("BRACES",
+                                "Blank lines aren't necessary before a close brace '}'\n" . $hereprev) &&
+                            $fix && $prevrawline =~ /^\+/) {
+                                fix_delete_line($fixlinenr - 1, $prevrawline);
+                        }
                 }
                 if (($rawline =~ /^.\s*$/ && $prevline =~ /^..*{\s*$/)) {
-                        CHK("BRACES",
-                            "Blank lines aren't necessary after an open brace '{'\n" . $hereprev);
+                        if (CHK("BRACES",
+                                "Blank lines aren't necessary after an open brace '{'\n" . $hereprev) &&
+                            $fix) {
+                                fix_delete_line($fixlinenr, $rawline);
+                        }
                 }
 
 # no volatiles please
@@ -4545,7 +4621,7 @@ sub process {
                 }
 
 # check for logging functions with KERN_<LEVEL>
-                if ($line !~ /printk\s*\(/ &&
+                if ($line !~ /printk(?:_ratelimited|_once)?\s*\(/ &&
                     $line =~ /\b$logFunctions\s*\(.*\b(KERN_[A-Z]+)\b/) {
                         my $level = $1;
                         if (WARN("UNNECESSARY_KERN_LEVEL",
@@ -4804,7 +4880,8 @@ sub process {
 # check for seq_printf uses that could be seq_puts
                 if ($sline =~ /\bseq_printf\s*\(.*"\s*\)\s*;\s*$/) {
                         my $fmt = get_quoted_string($line, $rawline);
-                        if ($fmt ne "" && $fmt !~ /[^\\]\%/) {
+                        $fmt =~ s/%%//g;
+                        if ($fmt !~ /%/) {
                                 if (WARN("PREFER_SEQ_PUTS",
                                          "Prefer seq_puts to seq_printf\n" . $herecurr) &&
                                     $fix) {
@@ -5089,6 +5166,12 @@ sub process {
                         }
                 }
 
+# check for uses of __DATE__, __TIME__, __TIMESTAMP__
+                while ($line =~ /\b(__(?:DATE|TIME|TIMESTAMP)__)\b/g) {
+                        ERROR("DATE_TIME",
+                              "Use of the '$1' macro makes the build non-deterministic\n" . $herecurr);
+                }
+
 # check for use of yield()
                 if ($line =~ /\byield\s*\(\s*\)/) {
                         WARN("YIELD",
@@ -5140,8 +5223,9 @@ sub process {
                              "please use device_initcall() or more appropriate function instead of __initcall() (see include/linux/init.h)\n" . $herecurr);
                 }
 
-# check for various ops structs, ensure they are const.
-                my $struct_ops = qr{acpi_dock_ops|
+# check for various structs that are normally const (ops, kgdb, device_tree)
+                my $const_structs = qr{
+                                acpi_dock_ops|
                                 address_space_operations|
                                 backlight_ops|
                                 block_device_operations|
@@ -5164,6 +5248,7 @@ sub process {
                                 mtrr_ops|
                                 neigh_ops|
                                 nlmsvc_binding|
+                                of_device_id|
                                 pci_raw_ops|
                                 pipe_buf_operations|
                                 platform_hibernation_ops|
@@ -5179,7 +5264,7 @@ sub process {
                                 usb_mon_operations|
                                 wd_ops}x;
                 if ($line !~ /\bconst\b/ &&
-                    $line =~ /\bstruct\s+($struct_ops)\b/) {
+                    $line =~ /\bstruct\s+($const_structs)\b/) {
                         WARN("CONST_STRUCT",
                              "struct $1 should normally be const\n" .
                                 $herecurr);
@@ -5204,6 +5289,13 @@ sub process {
                               "#define of '$1' is wrong - use Kconfig variables or standard guards instead\n" . $herecurr);
                 }
 
+# likely/unlikely comparisons similar to "(likely(foo) > 0)"
+                if ($^V && $^V ge 5.10.0 &&
+                    $line =~ /\b((?:un)?likely)\s*\(\s*$FuncArg\s*\)\s*$Compare/) {
+                        WARN("LIKELY_MISUSE",
+                             "Using $1 should generally have parentheses around the comparison\n" . $herecurr);
+                }
+
 # whine mightly about in_atomic
                 if ($line =~ /\bin_atomic\s*\(/) {
                         if ($realfile =~ m@^drivers/@) {
@@ -5255,6 +5347,9 @@ sub process {
                                              length($val) ne 4)) {
                                                 ERROR("NON_OCTAL_PERMISSIONS",
                                                       "Use 4 digit octal (0777) not decimal permissions\n" . $herecurr);
+                                        } elsif ($val =~ /^$Octal$/ && (oct($val) & 02)) {
+                                                ERROR("EXPORTED_WORLD_WRITABLE",
+                                                      "Exporting writable files is usually an error. Consider more restrictive permissions.\n" . $herecurr);
                                         }
                                 }
                         }
diff --git a/scripts/diffconfig b/scripts/diffconfig
index 6d672836e187..0db267d0adc9 100755
--- a/scripts/diffconfig
+++ b/scripts/diffconfig
@@ -28,7 +28,6 @@ If no config files are specified, .config and .config.old are used.
 Example usage:
  $ diffconfig .config config-with-some-changes
 -EXT2_FS_XATTR  n
--EXT2_FS_XIP  n
  CRAMFS  n -> y
  EXT2_FS  y -> n
  LOG_BUF_SHIFT  14 -> 16
diff --git a/scripts/module-common.lds b/scripts/module-common.lds
index 0865b3e752be..73a2c7da0e55 100644
--- a/scripts/module-common.lds
+++ b/scripts/module-common.lds
@@ -6,14 +6,17 @@
 SECTIONS {
         /DISCARD/ : { *(.discard) }
 
-        __ksymtab               : { *(SORT(___ksymtab+*)) }
-        __ksymtab_gpl           : { *(SORT(___ksymtab_gpl+*)) }
-        __ksymtab_unused        : { *(SORT(___ksymtab_unused+*)) }
-        __ksymtab_unused_gpl    : { *(SORT(___ksymtab_unused_gpl+*)) }
-        __ksymtab_gpl_future    : { *(SORT(___ksymtab_gpl_future+*)) }
-        __kcrctab               : { *(SORT(___kcrctab+*)) }
-        __kcrctab_gpl           : { *(SORT(___kcrctab_gpl+*)) }
-        __kcrctab_unused        : { *(SORT(___kcrctab_unused+*)) }
-        __kcrctab_unused_gpl    : { *(SORT(___kcrctab_unused_gpl+*)) }
-        __kcrctab_gpl_future    : { *(SORT(___kcrctab_gpl_future+*)) }
+        __ksymtab               0 : { *(SORT(___ksymtab+*)) }
+        __ksymtab_gpl           0 : { *(SORT(___ksymtab_gpl+*)) }
+        __ksymtab_unused        0 : { *(SORT(___ksymtab_unused+*)) }
+        __ksymtab_unused_gpl    0 : { *(SORT(___ksymtab_unused_gpl+*)) }
+        __ksymtab_gpl_future    0 : { *(SORT(___ksymtab_gpl_future+*)) }
+        __kcrctab               0 : { *(SORT(___kcrctab+*)) }
+        __kcrctab_gpl           0 : { *(SORT(___kcrctab_gpl+*)) }
+        __kcrctab_unused        0 : { *(SORT(___kcrctab_unused+*)) }
+        __kcrctab_unused_gpl    0 : { *(SORT(___kcrctab_unused_gpl+*)) }
+        __kcrctab_gpl_future    0 : { *(SORT(___kcrctab_gpl_future+*)) }
+
+        . = ALIGN(8);
+        .init_array             0 : { *(SORT(.init_array.*)) *(.init_array) }
 }
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 56ea99a12ab7..826470d7f000 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -242,8 +242,13 @@ if ($arch eq "x86_64") {
     $cc .= " -m32";
 
 } elsif ($arch eq "s390" && $bits == 64) {
-    $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_390_(PC|PLT)32DBL\\s+_mcount\\+0x2\$";
-    $mcount_adjust = -14;
+    if ($cc =~ /-DCC_USING_HOTPATCH/) {
+        $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*c0 04 00 00 00 00\\s*brcl\\s*0,[0-9a-f]+ <([^\+]*)>\$";
+        $mcount_adjust = 0;
+    } else {
+        $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_390_(PC|PLT)32DBL\\s+_mcount\\+0x2\$";
+        $mcount_adjust = -14;
+    }
     $alignment = 8;
     $type = ".quad";
     $ld .= " -m elf64_s390";
@@ -255,7 +260,6 @@ if ($arch eq "x86_64") {
     # force flags for this arch
     $ld .= " -m shlelf_linux";
     $objcopy .= " -O elf32-sh-linux";
-    $cc .= " -m32";
 
 } elsif ($arch eq "powerpc") {
     $local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\.?\\S+)";