Merge branches 'fixes' and 'misc' into for-next

Conflicts:
	arch/arm/kernel/iwmmxt.S
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/mmu.c

2 files changed, 12 insertions, 7 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 010b18ef4ea0..182be0f12407 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3476,12 +3476,17 @@ sub process {
                         }
                 }
 
-# unnecessary return in a void function? (a single leading tab, then return;)
-                if ($sline =~ /^\+\treturn\s*;\s*$/ &&
-                    $prevline =~ /^\+/) {
+# unnecessary return in a void function
+# at end-of-function, with the previous line a single leading tab, then return;
+# and the line before that not a goto label target like "out:"
+                if ($sline =~ /^[ \+]}\s*$/ &&
+                    $prevline =~ /^\+\treturn\s*;\s*$/ &&
+                    $linenr >= 3 &&
+                    $lines[$linenr - 3] =~ /^[ +]/ &&
+                    $lines[$linenr - 3] !~ /^[ +]\s*$Ident\s*:/) {
                         WARN("RETURN_VOID",
-                             "void function return statements are not generally useful\n" . $herecurr);
-                }
+                             "void function return statements are not generally useful\n" . $hereprev);
+               }
 
 # if statements using unnecessary parentheses - ie: if ((foo == bar))
                 if ($^V && $^V ge 5.10.0 &&
diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h
index 9d1421e63ff8..49b582a225b0 100644
--- a/scripts/recordmcount.h
+++ b/scripts/recordmcount.h
@@ -163,11 +163,11 @@ static int mcount_adjust = 0;
 
 static int MIPS_is_fake_mcount(Elf_Rel const *rp)
 {
-        static Elf_Addr old_r_offset;
+        static Elf_Addr old_r_offset = ~(Elf_Addr)0;
         Elf_Addr current_r_offset = _w(rp->r_offset);
         int is_fake;
 
-        is_fake = old_r_offset &&
+        is_fake = (old_r_offset != ~(Elf_Addr)0) &&
                 (current_r_offset - old_r_offset == MIPS_FAKEMCOUNT_OFFSET);
         old_r_offset = current_r_offset;