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, 18 insertions, 12 deletions

diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
index 5349473df1b1..3d50998abf57 100644
--- a/fs/cachefiles/internal.h
+++ b/fs/cachefiles/internal.h
@@ -9,6 +9,13 @@
  * 2 of the Licence, or (at your option) any later version.
  */
 
+#ifdef pr_fmt
+#undef pr_fmt
+#endif
+
+#define pr_fmt(fmt) "CacheFiles: " fmt
+
+
 #include <linux/fscache-cache.h>
 #include <linux/timer.h>
 #include <linux/wait.h>
@@ -245,11 +252,10 @@ extern int cachefiles_remove_object_xattr(struct cachefiles_cache *cache,
 /*
  * error handling
  */
-#define kerror(FMT, ...) printk(KERN_ERR "CacheFiles: "FMT"\n", ##__VA_ARGS__)
 
 #define cachefiles_io_error(___cache, FMT, ...)         \
 do {                                                    \
-        kerror("I/O Error: " FMT, ##__VA_ARGS__);       \
+        pr_err("I/O Error: " FMT, ##__VA_ARGS__);       \
         fscache_io_error(&(___cache)->cache);           \
         set_bit(CACHEFILES_DEAD, &(___cache)->flags);   \
 } while (0)
@@ -310,8 +316,8 @@ do {							\
 #define ASSERT(X)                                                       \
 do {                                                                    \
         if (unlikely(!(X))) {                                           \
-                printk(KERN_ERR "\n");                                  \
-                printk(KERN_ERR "CacheFiles: Assertion failed\n");      \
+                pr_err("\n");                                           \
+                pr_err("Assertion failed\n");           \
                 BUG();                                                  \
         }                                                               \
 } while (0)
@@ -319,9 +325,9 @@ do {									\
 #define ASSERTCMP(X, OP, Y)                                             \
 do {                                                                    \
         if (unlikely(!((X) OP (Y)))) {                                  \
-                printk(KERN_ERR "\n");                                  \
-                printk(KERN_ERR "CacheFiles: Assertion failed\n");      \
-                printk(KERN_ERR "%lx " #OP " %lx is false\n",           \
+                pr_err("\n");                                           \
+                pr_err("Assertion failed\n");           \
+                pr_err("%lx " #OP " %lx is false\n",                    \
                        (unsigned long)(X), (unsigned long)(Y));         \
                 BUG();                                                  \
         }                                                               \
@@ -330,8 +336,8 @@ do {									\
 #define ASSERTIF(C, X)                                                  \
 do {                                                                    \
         if (unlikely((C) && !(X))) {                                    \
-                printk(KERN_ERR "\n");                                  \
-                printk(KERN_ERR "CacheFiles: Assertion failed\n");      \
+                pr_err("\n");                                           \
+                pr_err("Assertion failed\n");           \
                 BUG();                                                  \
         }                                                               \
 } while (0)
@@ -339,9 +345,9 @@ do {									\
 #define ASSERTIFCMP(C, X, OP, Y)                                        \
 do {                                                                    \
         if (unlikely((C) && !((X) OP (Y)))) {                           \
-                printk(KERN_ERR "\n");                                  \
-                printk(KERN_ERR "CacheFiles: Assertion failed\n");      \
-                printk(KERN_ERR "%lx " #OP " %lx is false\n",           \
+                pr_err("\n");                                           \
+                pr_err("Assertion failed\n");           \
+                pr_err("%lx " #OP " %lx is false\n",                    \
                        (unsigned long)(X), (unsigned long)(Y));         \
                 BUG();                                                  \
         }                                                               \