Merge branch 'akpm' (patches from Andrew Morton) into next

Merge more updates from Andrew Morton:

 - Most of the rest of MM.

   This includes "mark remap_file_pages syscall as deprecated" but the
   actual "replace remap_file_pages syscall with emulation" is held
   back.  I guess we'll need to work out when to pull the trigger on
   that one.

 - various minor cleanups to obscure filesystems

 - the drivers/rtc queue

 - hfsplus updates

 - ufs, hpfs, fatfs, affs, reiserfs

 - Documentation/

 - signals

 - procfs

 - cpu hotplug

 - lib/idr.c

 - rapidio

 - sysctl

 - ipc updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (171 commits)
  ufs: sb mutex merge + mutex_destroy
  powerpc: update comments for generic idle conversion
  cris: update comments for generic idle conversion
  idle: remove cpu_idle() forward declarations
  nbd: zero from and len fields in NBD_CMD_DISCONNECT.
  mm: convert some level-less printks to pr_*
  MAINTAINERS: adi-buildroot-devel is moderated
  MAINTAINERS: add linux-api for review of API/ABI changes
  mm/kmemleak-test.c: use pr_fmt for logging
  fs/dlm/debug_fs.c: replace seq_printf by seq_puts
  fs/dlm/lockspace.c: convert simple_str to kstr
  fs/dlm/config.c: convert simple_str to kstr
  mm: mark remap_file_pages() syscall as deprecated
  mm: memcontrol: remove unnecessary memcg argument from soft limit functions
  mm: memcontrol: clean up memcg zoneinfo lookup
  mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
  mm/mempool.c: update the kmemleak stack trace for mempool allocations
  lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
  mm: introduce kmemleak_update_trace()
  mm/kmemleak.c: use %u to print ->checksum
  ...

1 files changed, 9 insertions, 10 deletions

diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 46d269e38706..0a9b72cdfeca 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -18,6 +18,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define pr_fmt(fmt) "pstore: " fmt
+
 #include <linux/atomic.h>
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -224,14 +226,12 @@ static void allocate_buf_for_compression(void)
                         zlib_inflate_workspacesize());
                 stream.workspace = kmalloc(size, GFP_KERNEL);
                 if (!stream.workspace) {
-                        pr_err("pstore: No memory for compression workspace; "
-                                "skipping compression\n");
+                        pr_err("No memory for compression workspace; skipping compression\n");
                         kfree(big_oops_buf);
                         big_oops_buf = NULL;
                 }
         } else {
-                pr_err("No memory for uncompressed data; "
-                        "skipping compression\n");
+                pr_err("No memory for uncompressed data; skipping compression\n");
                 stream.workspace = NULL;
         }
 
@@ -455,8 +455,7 @@ int pstore_register(struct pstore_info *psi)
                 add_timer(&pstore_timer);
         }
 
-        pr_info("pstore: Registered %s as persistent store backend\n",
-                psi->name);
+        pr_info("Registered %s as persistent store backend\n", psi->name);
 
         return 0;
 }
@@ -502,8 +501,8 @@ void pstore_get_records(int quiet)
                                 size = unzipped_len;
                                 compressed = false;
                         } else {
-                                pr_err("pstore: decompression failed;"
-                                        "returned %d\n", unzipped_len);
+                                pr_err("decompression failed;returned %d\n",
+                                       unzipped_len);
                                 compressed = true;
                         }
                 }
@@ -524,8 +523,8 @@ out:
         mutex_unlock(&psi->read_mutex);
 
         if (failed)
-                printk(KERN_WARNING "pstore: failed to load %d record(s) from '%s'\n",
-                       failed, psi->name);
+                pr_warn("failed to load %d record(s) from '%s'\n",
+                        failed, psi->name);
 }
 
 static void pstore_dowork(struct work_struct *work)