Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/smc911x.c

2 files changed, 14 insertions, 17 deletions

diff --git a/ipc/msg.c b/ipc/msg.c
index 32494e8cc7a5..b4eee1c6101d 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -98,20 +98,15 @@ void recompute_msgmni(struct ipc_namespace *ns)
 
         if (allowed < MSGMNI) {
                 ns->msg_ctlmni = MSGMNI;
-                goto out_callback;
+                return;
         }
 
         if (allowed > IPCMNI / nb_ns) {
                 ns->msg_ctlmni = IPCMNI / nb_ns;
-                goto out_callback;
+                return;
         }
 
         ns->msg_ctlmni = allowed;
-
-out_callback:
-
-        printk(KERN_INFO "msgmni has been set to %d for ipc namespace %p\n",
-                ns->msg_ctlmni, ns);
 }
 
 void msg_init_ns(struct ipc_namespace *ns)
@@ -136,6 +131,10 @@ void msg_exit_ns(struct ipc_namespace *ns)
 void __init msg_init(void)
 {
         msg_init_ns(&init_ipc_ns);
+
+        printk(KERN_INFO "msgmni has been set to %d\n",
+                init_ipc_ns.msg_ctlmni);
+
         ipc_init_proc_interface("sysvipc/msg",
                                 "       key      msqid perms      cbytes       qnum lspid lrpid   uid   gid  cuid  cgid      stime      rtime      ctime\n",
                                 IPC_MSG_IDS, sysvipc_msg_proc_show);
diff --git a/ipc/shm.c b/ipc/shm.c
index 554429ade079..790240cd067f 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -894,8 +894,6 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
         if (!sfd)
                 goto out_put_dentry;
 
-        err = -ENOMEM;
-
         file = alloc_file(path.mnt, path.dentry, f_mode, &shm_file_operations);
         if (!file)
                 goto out_free;
@@ -1060,16 +1058,16 @@ asmlinkage long sys_shmdt(char __user *shmaddr)
 static int sysvipc_shm_proc_show(struct seq_file *s, void *it)
 {
         struct shmid_kernel *shp = it;
-        char *format;
 
-#define SMALL_STRING "%10d %10d  %4o %10u %5u %5u  %5d %5u %5u %5u %5u %10lu %10lu %10lu\n"
-#define BIG_STRING   "%10d %10d  %4o %21u %5u %5u  %5d %5u %5u %5u %5u %10lu %10lu %10lu\n"
+#if BITS_PER_LONG <= 32
+#define SIZE_SPEC "%10lu"
+#else
+#define SIZE_SPEC "%21lu"
+#endif
 
-        if (sizeof(size_t) <= sizeof(int))
-                format = SMALL_STRING;
-        else
-                format = BIG_STRING;
-        return seq_printf(s, format,
+        return seq_printf(s,
+                          "%10d %10d  %4o " SIZE_SPEC " %5u %5u  "
+                          "%5lu %5u %5u %5u %5u %10lu %10lu %10lu\n",
                           shp->shm_perm.key,
                           shp->shm_perm.id,
                           shp->shm_perm.mode,