Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 127 insertions, 0 deletions

diff --git a/arch/sparc64/solaris/ipc.c b/arch/sparc64/solaris/ipc.c
new file mode 100644
index 000000000000..8cef5fd57b2e
--- /dev/null
+++ b/arch/sparc64/solaris/ipc.c
@@ -0,0 +1,127 @@
+/* $Id: ipc.c,v 1.5 1999/12/09 00:41:00 davem Exp $
+ * ipc.c: Solaris IPC emulation
+ *
+ * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/smp_lock.h>
+#include <linux/wait.h>
+#include <linux/mm.h>
+#include <linux/shm.h>
+#include <linux/sem.h>
+#include <linux/msg.h>
+
+#include <asm/uaccess.h>
+#include <asm/string.h>
+#include <asm/ipc.h>
+
+#include "conv.h"
+
+struct solaris_ipc_perm {
+        s32     uid;
+        s32     gid;
+        s32     cuid;
+        s32     cgid;
+        u32     mode;
+        u32     seq;
+        int     key;
+        s32     pad[4];
+};
+
+struct solaris_shmid_ds {
+        struct solaris_ipc_perm shm_perm;
+        int                     shm_segsz;
+        u32                     shm_amp;
+        unsigned short          shm_lkcnt;
+        char                    __padxx[2];
+        s32                     shm_lpid;
+        s32                     shm_cpid;
+        u32                     shm_nattch;
+        u32                     shm_cnattch;
+        s32                     shm_atime;
+        s32                     shm_pad1;
+        s32                     shm_dtime;
+        s32                     shm_pad2;
+        s32                     shm_ctime;
+        s32                     shm_pad3;
+        unsigned short          shm_cv;
+        char                    shm_pad4[2];
+        u32                     shm_sptas;
+        s32                     shm_pad5[2];
+};
+
+asmlinkage long solaris_shmsys(int cmd, u32 arg1, u32 arg2, u32 arg3)
+{
+        int (*sys_ipc)(unsigned,int,int,unsigned long,void __user *,long) = 
+                (int (*)(unsigned,int,int,unsigned long,void __user *,long))SYS(ipc);
+        mm_segment_t old_fs;
+        unsigned long raddr;
+        int ret;
+                
+        switch (cmd) {
+        case 0: /* shmat */
+                old_fs = get_fs();
+                set_fs(KERNEL_DS);
+                ret = sys_ipc(SHMAT, arg1, arg3 & ~0x4000, (unsigned long)&raddr, A(arg2), 0);
+                set_fs(old_fs);
+                if (ret >= 0) return (u32)raddr;
+                else return ret;
+        case 1: /* shmctl */
+                switch (arg2) {
+                case 3: /* SHM_LOCK */
+                case 4: /* SHM_UNLOCK */
+                        return sys_ipc(SHMCTL, arg1, (arg2 == 3) ? SHM_LOCK : SHM_UNLOCK, 0, NULL, 0);
+                case 10: /* IPC_RMID */
+                        return sys_ipc(SHMCTL, arg1, IPC_RMID, 0, NULL, 0);
+                case 11: /* IPC_SET */
+                        {
+                                struct shmid_ds s;
+                                struct solaris_shmid_ds __user *p = A(arg3);
+                                
+                                if (get_user (s.shm_perm.uid, &p->shm_perm.uid) ||
+                                    __get_user (s.shm_perm.gid, &p->shm_perm.gid) || 
+                                    __get_user (s.shm_perm.mode, &p->shm_perm.mode))
+                                        return -EFAULT;
+                                old_fs = get_fs();
+                                set_fs(KERNEL_DS);
+                                ret = sys_ipc(SHMCTL, arg1, IPC_SET, 0, &s, 0);
+                                set_fs(old_fs);
+                                return ret;
+                        }
+                case 12: /* IPC_STAT */
+                        {
+                                struct shmid_ds s;
+                                struct solaris_shmid_ds __user *p = A(arg3);
+                                
+                                old_fs = get_fs();
+                                set_fs(KERNEL_DS);
+                                ret = sys_ipc(SHMCTL, arg1, IPC_SET, 0, &s, 0);
+                                set_fs(old_fs);
+                                if (put_user (s.shm_perm.uid, &(p->shm_perm.uid)) ||
+                                    __put_user (s.shm_perm.gid, &(p->shm_perm.gid)) || 
+                                    __put_user (s.shm_perm.cuid, &(p->shm_perm.cuid)) ||
+                                    __put_user (s.shm_perm.cgid, &(p->shm_perm.cgid)) || 
+                                    __put_user (s.shm_perm.mode, &(p->shm_perm.mode)) ||
+                                    __put_user (s.shm_perm.seq, &(p->shm_perm.seq)) ||
+                                    __put_user (s.shm_perm.key, &(p->shm_perm.key)) ||
+                                    __put_user (s.shm_segsz, &(p->shm_segsz)) ||
+                                    __put_user (s.shm_lpid, &(p->shm_lpid)) ||
+                                    __put_user (s.shm_cpid, &(p->shm_cpid)) ||
+                                    __put_user (s.shm_nattch, &(p->shm_nattch)) ||
+                                    __put_user (s.shm_atime, &(p->shm_atime)) ||
+                                    __put_user (s.shm_dtime, &(p->shm_dtime)) ||
+                                    __put_user (s.shm_ctime, &(p->shm_ctime)))
+                                        return -EFAULT;
+                                return ret;
+                        }
+                default: return -EINVAL;
+                }
+        case 2: /* shmdt */
+                return sys_ipc(SHMDT, 0, 0, 0, A(arg1), 0);
+        case 3: /* shmget */
+                return sys_ipc(SHMGET, arg1, arg2, arg3, NULL, 0);
+        }
+        return -EINVAL;
+}