Merge branch 'akpm' (patchbomb from Andrew) into next

Merge misc updates from Andrew Morton:

 - a few fixes for 3.16.  Cc'ed to stable so they'll get there somehow.

 - various misc fixes and cleanups

 - most of the ocfs2 queue.  Review is slow...

 - most of MM.  The MM queue is pretty huge this time, but not much in
   the way of feature work.

 - some tweaks under kernel/

 - printk maintenance work

 - updates to lib/

 - checkpatch updates

 - tweaks to init/

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (276 commits)
  fs/autofs4/dev-ioctl.c: add __init to autofs_dev_ioctl_init
  fs/ncpfs/getopt.c: replace simple_strtoul by kstrtoul
  init/main.c: remove an ifdef
  kthreads: kill CLONE_KERNEL, change kernel_thread(kernel_init) to avoid CLONE_SIGHAND
  init/main.c: add initcall_blacklist kernel parameter
  init/main.c: don't use pr_debug()
  fs/binfmt_flat.c: make old_reloc() static
  fs/binfmt_elf.c: fix bool assignements
  fs/efs: convert printk(KERN_DEBUG to pr_debug
  fs/efs: add pr_fmt / use __func__
  fs/efs: convert printk to pr_foo()
  scripts/checkpatch.pl: device_initcall is not the only __initcall substitute
  checkpatch: check stable email address
  checkpatch: warn on unnecessary void function return statements
  checkpatch: prefer kstrto<foo> to sscanf(buf, "%<lhuidx>", &bar);
  checkpatch: add warning for kmalloc/kzalloc with multiply
  checkpatch: warn on #defines ending in semicolon
  checkpatch: make --strict a default for files in drivers/net and net/
  checkpatch: always warn on missing blank line after variable declaration block
  checkpatch: fix wildcard DT compatible string checking
  ...

2 files changed, 13 insertions, 9 deletions

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index c8780cdaf852..33db43a39515 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -786,8 +786,9 @@ static long hardpps_update_freq(struct pps_normtime freq_norm)
                 time_status |= STA_PPSERROR;
                 pps_errcnt++;
                 pps_dec_freq_interval();
-                pr_err("hardpps: PPSERROR: interval too long - %ld s\n",
-                                freq_norm.sec);
+                printk_deferred(KERN_ERR
+                        "hardpps: PPSERROR: interval too long - %ld s\n",
+                        freq_norm.sec);
                 return 0;
         }
 
@@ -800,7 +801,8 @@ static long hardpps_update_freq(struct pps_normtime freq_norm)
         delta = shift_right(ftemp - pps_freq, NTP_SCALE_SHIFT);
         pps_freq = ftemp;
         if (delta > PPS_MAXWANDER || delta < -PPS_MAXWANDER) {
-                pr_warning("hardpps: PPSWANDER: change=%ld\n", delta);
+                printk_deferred(KERN_WARNING
+                                "hardpps: PPSWANDER: change=%ld\n", delta);
                 time_status |= STA_PPSWANDER;
                 pps_stbcnt++;
                 pps_dec_freq_interval();
@@ -844,8 +846,9 @@ static void hardpps_update_phase(long error)
          * the time offset is updated.
          */
         if (jitter > (pps_jitter << PPS_POPCORN)) {
-                pr_warning("hardpps: PPSJITTER: jitter=%ld, limit=%ld\n",
-                       jitter, (pps_jitter << PPS_POPCORN));
+                printk_deferred(KERN_WARNING
+                                "hardpps: PPSJITTER: jitter=%ld, limit=%ld\n",
+                                jitter, (pps_jitter << PPS_POPCORN));
                 time_status |= STA_PPSJITTER;
                 pps_jitcnt++;
         } else if (time_status & STA_PPSTIME) {
@@ -902,7 +905,7 @@ void __hardpps(const struct timespec *phase_ts, const struct timespec *raw_ts)
                 time_status |= STA_PPSJITTER;
                 /* restart the frequency calibration interval */
                 pps_fbase = *raw_ts;
-                pr_err("hardpps: PPSJITTER: bad pulse\n");
+                printk_deferred(KERN_ERR "hardpps: PPSJITTER: bad pulse\n");
                 return;
         }
 
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index f7df8ea21707..32d8d6aaedb8 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -852,8 +852,9 @@ static void __timekeeping_inject_sleeptime(struct timekeeper *tk,
                                                         struct timespec *delta)
 {
         if (!timespec_valid_strict(delta)) {
-                printk(KERN_WARNING "__timekeeping_inject_sleeptime: Invalid "
-                                        "sleep delta value!\n");
+                printk_deferred(KERN_WARNING
+                                "__timekeeping_inject_sleeptime: Invalid "
+                                "sleep delta value!\n");
                 return;
         }
         tk_xtime_add(tk, delta);
@@ -1157,7 +1158,7 @@ static void timekeeping_adjust(struct timekeeper *tk, s64 offset)
 
         if (unlikely(tk->clock->maxadj &&
                 (tk->mult + adj > tk->clock->mult + tk->clock->maxadj))) {
-                printk_once(KERN_WARNING
+                printk_deferred_once(KERN_WARNING
                         "Adjusting %s more than 11%% (%ld vs %ld)\n",
                         tk->clock->name, (long)tk->mult + adj,
                         (long)tk->clock->mult + tk->clock->maxadj);