Merge branch 'akpm' (Andrew's patch-bomb)

Merge Andrew's first set of patches:
 "Non-MM patches:

   - lots of misc bits

   - tree-wide have_clk() cleanups

   - quite a lot of printk tweaks.  I draw your attention to "printk:
     convert the format for KERN_<LEVEL> to a 2 byte pattern" which
     looks a bit scary.  But afaict it's solid.

   - backlight updates

   - lib/ feature work (notably the addition and use of memweight())

   - checkpatch updates

   - rtc updates

   - nilfs updates

   - fatfs updates (partial, still waiting for acks)

   - kdump, proc, fork, IPC, sysctl, taskstats, pps, etc

   - new fault-injection feature work"

* Merge emailed patches from Andrew Morton <akpm@linux-foundation.org>: (128 commits)
  drivers/misc/lkdtm.c: fix missing allocation failure check
  lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table()
  fault-injection: add tool to run command with failslab or fail_page_alloc
  fault-injection: add selftests for cpu and memory hotplug
  powerpc: pSeries reconfig notifier error injection module
  memory: memory notifier error injection module
  PM: PM notifier error injection module
  cpu: rewrite cpu-notifier-error-inject module
  fault-injection: notifier error injection
  c/r: fcntl: add F_GETOWNER_UIDS option
  resource: make sure requested range is included in the root range
  include/linux/aio.h: cpp->C conversions
  fs: cachefiles: add support for large files in filesystem caching
  pps: return PTR_ERR on error in device_create
  taskstats: check nla_reserve() return
  sysctl: suppress kmemleak messages
  ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION
  ipc: compat: use signed size_t types for msgsnd and msgrcv
  ipc: allow compat IPC version field parsing if !ARCH_WANT_OLD_COMPAT_IPC
  ipc: add COMPAT_SHMLBA support
  ...

1 files changed, 68 insertions, 3 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index e5bd60ff48e3..913d6bdfdda3 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1600,13 +1600,17 @@ sub process {
 
 # Check signature styles
                 if (!$in_header_lines &&
-                    $line =~ /^(\s*)($signature_tags)(\s*)(.*)/) {
+                    $line =~ /^(\s*)([a-z0-9_-]+by:|$signature_tags)(\s*)(.*)/i) {
                         my $space_before = $1;
                         my $sign_off = $2;
                         my $space_after = $3;
                         my $email = $4;
                         my $ucfirst_sign_off = ucfirst(lc($sign_off));
 
+                        if ($sign_off !~ /$signature_tags/) {
+                                WARN("BAD_SIGN_OFF",
+                                     "Non-standard signature: $sign_off\n" . $herecurr);
+                        }
                         if (defined $space_before && $space_before ne "") {
                                 WARN("BAD_SIGN_OFF",
                                      "Do not use whitespace before $ucfirst_sign_off\n" . $herecurr);
@@ -1848,8 +1852,8 @@ sub process {
 
                         my $pos = pos_last_openparen($rest);
                         if ($pos >= 0) {
-                                $line =~ /^\+([ \t]*)/;
-                                my $newindent = $1;
+                                $line =~ /^(\+| )([ \t]*)/;
+                                my $newindent = $2;
 
                                 my $goodtabindent = $oldindent .
                                         "\t" x ($pos / 8) .
@@ -2984,6 +2988,45 @@ sub process {
                         }
                 }
 
+# do {} while (0) macro tests:
+# single-statement macros do not need to be enclosed in do while (0) loop,
+# macro should not end with a semicolon
+                if ($^V && $^V ge 5.10.0 &&
+                    $realfile !~ m@/vmlinux.lds.h$@ &&
+                    $line =~ /^.\s*\#\s*define\s+$Ident(\()?/) {
+                        my $ln = $linenr;
+                        my $cnt = $realcnt;
+                        my ($off, $dstat, $dcond, $rest);
+                        my $ctx = '';
+                        ($dstat, $dcond, $ln, $cnt, $off) =
+                                ctx_statement_block($linenr, $realcnt, 0);
+                        $ctx = $dstat;
+
+                        $dstat =~ s/\\\n.//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;
+                                my $semis = $3;
+
+                                $ctx =~ s/\n*$//;
+                                my $cnt = statement_rawlines($ctx);
+                                my $herectx = $here . "\n";
+
+                                for (my $n = 0; $n < $cnt; $n++) {
+                                        $herectx .= raw_line($linenr, $n) . "\n";
+                                }
+
+                                if (($stmts =~ tr/;/;/) == 1) {
+                                        WARN("SINGLE_STATEMENT_DO_WHILE_MACRO",
+                                             "Single statement macros should not use a do {} while (0) loop\n" . "$herectx");
+                                }
+                                if (defined $semis && $semis ne "") {
+                                        WARN("DO_WHILE_MACRO_WITH_TRAILING_SEMICOLON",
+                                             "do {} while (0) macros should not be semicolon terminated\n" . "$herectx");
+                                }
+                        }
+                }
+
 # make sure symbols are always wrapped with VMLINUX_SYMBOL() ...
 # all assignments may have only one of the following with an assignment:
 #       .
@@ -3261,6 +3304,12 @@ sub process {
                              "sizeof(& should be avoided\n" . $herecurr);
                 }
 
+# check for sizeof without parenthesis
+                if ($line =~ /\bsizeof\s+((?:\*\s*|)$Lval|$Type(?:\s+$Lval|))/) {
+                        WARN("SIZEOF_PARENTHESIS",
+                             "sizeof $1 should be sizeof($1)\n" . $herecurr);
+                }
+
 # check for line continuations in quoted strings with odd counts of "
                 if ($rawline =~ /\\$/ && $rawline =~ tr/"/"/ % 2) {
                         WARN("LINE_CONTINUATIONS",
@@ -3309,6 +3358,22 @@ sub process {
                         }
                 }
 
+# check usleep_range arguments
+                if ($^V && $^V ge 5.10.0 &&
+                    defined $stat &&
+                    $stat =~ /^\+(?:.*?)\busleep_range\s*\(\s*($FuncArg)\s*,\s*($FuncArg)\s*\)/) {
+                        my $min = $1;
+                        my $max = $7;
+                        if ($min eq $max) {
+                                WARN("USLEEP_RANGE",
+                                     "usleep_range should not use min == max args; see Documentation/timers/timers-howto.txt\n" . "$here\n$stat\n");
+                        } elsif ($min =~ /^\d+$/ && $max =~ /^\d+$/ &&
+                                 $min > $max) {
+                                WARN("USLEEP_RANGE",
+                                     "usleep_range args reversed, use min then max; see Documentation/timers/timers-howto.txt\n" . "$here\n$stat\n");
+                        }
+                }
+
 # check for new externs in .c files.
                 if ($realfile =~ /\.c$/ && defined $stat &&
                     $stat =~ /^.\s*(?:extern\s+)?$Type\s+($Ident)(\s*)\(/s)