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

diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
index 3a731976dc5e..21fcf8dcb9cd 100644
--- a/fs/coda/upcall.c
+++ b/fs/coda/upcall.c
@@ -508,8 +508,8 @@ int venus_pioctl(struct super_block *sb, struct CodaFid *fid,
         inp->coda_ioctl.data = (char *)(INSIZE(ioctl));
      
         /* get the data out of user space */
-        if ( copy_from_user((char*)inp + (long)inp->coda_ioctl.data,
-                            data->vi.in, data->vi.in_size) ) {
+        if (copy_from_user((char *)inp + (long)inp->coda_ioctl.data,
+                           data->vi.in, data->vi.in_size)) {
                 error = -EINVAL;
                 goto exit;
         }
@@ -518,8 +518,8 @@ int venus_pioctl(struct super_block *sb, struct CodaFid *fid,
                             &outsize, inp);
 
         if (error) {
-                printk("coda_pioctl: Venus returns: %d for %s\n", 
-                       error, coda_f2s(fid));
+                pr_warn("%s: Venus returns: %d for %s\n",
+                        __func__, error, coda_f2s(fid));
                 goto exit; 
         }
 
@@ -675,7 +675,7 @@ static int coda_upcall(struct venus_comm *vcp,
         mutex_lock(&vcp->vc_mutex);
 
         if (!vcp->vc_inuse) {
-                printk(KERN_NOTICE "coda: Venus dead, not sending upcall\n");
+                pr_notice("Venus dead, not sending upcall\n");
                 error = -ENXIO;
                 goto exit;
         }
@@ -725,7 +725,7 @@ static int coda_upcall(struct venus_comm *vcp,
 
         error = -EINTR;
         if ((req->uc_flags & CODA_REQ_ABORT) || !signal_pending(current)) {
-                printk(KERN_WARNING "coda: Unexpected interruption.\n");
+                pr_warn("Unexpected interruption.\n");
                 goto exit;
         }
 
@@ -735,7 +735,7 @@ static int coda_upcall(struct venus_comm *vcp,
 
         /* Venus saw the upcall, make sure we can send interrupt signal */
         if (!vcp->vc_inuse) {
-                printk(KERN_INFO "coda: Venus dead, not sending signal.\n");
+                pr_info("Venus dead, not sending signal.\n");
                 goto exit;
         }