Merge branch 'akpm' (patches from Andrew)

Merge second patchbomb from Andrew Morton:

 - the rest of MM

 - various misc bits

 - add ability to run /sbin/reboot at reboot time

 - printk/vsprintf changes

 - fiddle with seq_printf() return value

* akpm: (114 commits)
  parisc: remove use of seq_printf return value
  lru_cache: remove use of seq_printf return value
  tracing: remove use of seq_printf return value
  cgroup: remove use of seq_printf return value
  proc: remove use of seq_printf return value
  s390: remove use of seq_printf return value
  cris fasttimer: remove use of seq_printf return value
  cris: remove use of seq_printf return value
  openrisc: remove use of seq_printf return value
  ARM: plat-pxa: remove use of seq_printf return value
  nios2: cpuinfo: remove use of seq_printf return value
  microblaze: mb: remove use of seq_printf return value
  ipc: remove use of seq_printf return value
  rtc: remove use of seq_printf return value
  power: wakeup: remove use of seq_printf return value
  x86: mtrr: if: remove use of seq_printf return value
  linux/bitmap.h: improve BITMAP_{LAST,FIRST}_WORD_MASK
  MAINTAINERS: CREDITS: remove Stefano Brivio from B43
  .mailmap: add Ricardo Ribalda
  CREDITS: add Ricardo Ribalda Delgado
  ...

1 files changed, 22 insertions, 20 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index 19633b4a2350..d280a74af2ef 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -1342,25 +1342,27 @@ static int sysvipc_shm_proc_show(struct seq_file *s, void *it)
 #define SIZE_SPEC "%21lu"
 #endif
 
-        return seq_printf(s,
-                          "%10d %10d  %4o " SIZE_SPEC " %5u %5u  "
-                          "%5lu %5u %5u %5u %5u %10lu %10lu %10lu "
-                          SIZE_SPEC " " SIZE_SPEC "\n",
-                          shp->shm_perm.key,
-                          shp->shm_perm.id,
-                          shp->shm_perm.mode,
-                          shp->shm_segsz,
-                          shp->shm_cprid,
-                          shp->shm_lprid,
-                          shp->shm_nattch,
-                          from_kuid_munged(user_ns, shp->shm_perm.uid),
-                          from_kgid_munged(user_ns, shp->shm_perm.gid),
-                          from_kuid_munged(user_ns, shp->shm_perm.cuid),
-                          from_kgid_munged(user_ns, shp->shm_perm.cgid),
-                          shp->shm_atim,
-                          shp->shm_dtim,
-                          shp->shm_ctim,
-                          rss * PAGE_SIZE,
-                          swp * PAGE_SIZE);
+        seq_printf(s,
+                   "%10d %10d  %4o " SIZE_SPEC " %5u %5u  "
+                   "%5lu %5u %5u %5u %5u %10lu %10lu %10lu "
+                   SIZE_SPEC " " SIZE_SPEC "\n",
+                   shp->shm_perm.key,
+                   shp->shm_perm.id,
+                   shp->shm_perm.mode,
+                   shp->shm_segsz,
+                   shp->shm_cprid,
+                   shp->shm_lprid,
+                   shp->shm_nattch,
+                   from_kuid_munged(user_ns, shp->shm_perm.uid),
+                   from_kgid_munged(user_ns, shp->shm_perm.gid),
+                   from_kuid_munged(user_ns, shp->shm_perm.cuid),
+                   from_kgid_munged(user_ns, shp->shm_perm.cgid),
+                   shp->shm_atim,
+                   shp->shm_dtim,
+                   shp->shm_ctim,
+                   rss * PAGE_SIZE,
+                   swp * PAGE_SIZE);
+
+        return 0;
 }
 #endif