Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / arch / sparc64 / solaris / misc.c

diff --git a/arch/sparc64/solaris/misc.c b/arch/sparc64/solaris/misc.c
index 4a3db02..036d5f2 100644 (file)
--- a/arch/sparc64/solaris/misc.c
+++ b/arch/sparc64/solaris/misc.c
@@ -17,6 +17,7 @@
 #include <linux/timex.h>
 #include <linux/major.h>
 #include <linux/compat.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/string.h>
@@ -90,7 +91,7 @@ static u32 do_solaris_mmap(u32 addr, u32 len, u32 prot, u32 flags, u32 fd, u64 o
        len = PAGE_ALIGN(len);
        if(!(flags & MAP_FIXED))
                addr = 0;
-       else if (len > 0xf0000000UL || addr > 0xf0000000UL - len)
+       else if (len > STACK_TOP32 || addr > STACK_TOP32 - len)
                goto out_putf;
        ret_type = flags & _MAP_NEW;
        flags &= ~_MAP_NEW;
@@ -102,7 +103,7 @@ static u32 do_solaris_mmap(u32 addr, u32 len, u32 prot, u32 flags, u32 fd, u64 o
                         (unsigned long) prot, (unsigned long) flags, off);
        up_write(&current->mm->mmap_sem);
        if(!ret_type)
-               retval = ((retval < 0xf0000000) ? 0 : retval);
+               retval = ((retval < STACK_TOP32) ? 0 : retval);
                                
 out_putf:
        if (file)
@@ -137,21 +138,34 @@ asmlinkage int solaris_brk(u32 brk)
        return sunos_brk(brk);
 }
 
-#define set_utsfield(to, from, dotchop, countfrom) {                   \
-       char *p;                                                        \
-       int i, len = (countfrom) ?                                      \
-               ((sizeof(to) > sizeof(from) ?                           \
-                       sizeof(from) : sizeof(to))) : sizeof(to);       \
-       if (copy_to_user(to, from, len))                                \
-               return -EFAULT;                                         \
-       if (dotchop)                                                    \
-               for (p=from,i=0; *p && *p != '.' && --len; p++,i++);    \
-       else                                                            \
-               i = len - 1;                                            \
-       if (__put_user('\0', (char __user *)((to)+i)))                  \
-               return -EFAULT;                                         \
+static int __set_utsfield(char __user *to, int to_size,
+                         const char *from, int from_size,
+                         int dotchop, int countfrom)
+{
+       int len = countfrom ? (to_size > from_size ?
+                              from_size : to_size) : to_size;
+       int off;
+
+       if (copy_to_user(to, from, len))
+               return -EFAULT;
+
+       off = len < to_size? len: len - 1;
+       if (dotchop) {
+               const char *p = strnchr(from, len, '.');
+               if (p) off = p - from;
+       }
+
+       if (__put_user('\0', to + off))
+               return -EFAULT;
+
+       return 0;
 }
 
+#define set_utsfield(to, from, dotchop, countfrom) \
+       __set_utsfield((to), sizeof(to), \
+                      (from), sizeof(from), \
+                      (dotchop), (countfrom))
+
 struct sol_uname {
        char sysname[9];
        char nodename[9];
@@ -219,17 +233,20 @@ static char *serial(char *buffer)
 asmlinkage int solaris_utssys(u32 buf, u32 flags, int which, u32 buf2)
 {
        struct sol_uname __user *v = A(buf);
+       int err;
+
        switch (which) {
        case 0: /* old uname */
                /* Let's cheat */
-               set_utsfield(v->sysname, "SunOS", 1, 0);
+               err  = set_utsfield(v->sysname, "SunOS", 1, 0);
                down_read(&uts_sem);
-               set_utsfield(v->nodename, system_utsname.nodename, 1, 1);
+               err |= set_utsfield(v->nodename, vx_new_uts(nodename),
+                                   1, 1);
                up_read(&uts_sem);
-               set_utsfield(v->release, "2.6", 0, 0);
-               set_utsfield(v->version, "Generic", 0, 0);
-               set_utsfield(v->machine, machine(), 0, 0);
-               return 0;
+               err |= set_utsfield(v->release, "2.6", 0, 0);
+               err |= set_utsfield(v->version, "Generic", 0, 0);
+               err |= set_utsfield(v->machine, machine(), 0, 0);
+               return (err ? -EFAULT : 0);
        case 2: /* ustat */
                return -ENOSYS;
        case 3: /* fusers */
@@ -242,15 +259,18 @@ asmlinkage int solaris_utssys(u32 buf, u32 flags, int which, u32 buf2)
 asmlinkage int solaris_utsname(u32 buf)
 {
        struct sol_utsname __user *v = A(buf);
+       int err;
+
        /* Why should we not lie a bit? */
        down_read(&uts_sem);
-       set_utsfield(v->sysname, "SunOS", 0, 0);
-       set_utsfield(v->nodename, system_utsname.nodename, 1, 1);
-       set_utsfield(v->release, "5.6", 0, 0);
-       set_utsfield(v->version, "Generic", 0, 0);
-       set_utsfield(v->machine, machine(), 0, 0);
+       err  = set_utsfield(v->sysname, "SunOS", 0, 0);
+       err |= set_utsfield(v->nodename, vx_new_uts(nodename), 1, 1);
+       err |= set_utsfield(v->release, "5.6", 0, 0);
+       err |= set_utsfield(v->version, "Generic", 0, 0);
+       err |= set_utsfield(v->machine, machine(), 0, 0);
        up_read(&uts_sem);
-       return 0;
+
+       return (err ? -EFAULT : 0);
 }
 
 #define SI_SYSNAME             1       /* return name of operating system */
@@ -276,7 +296,7 @@ asmlinkage int solaris_sysinfo(int cmd, u32 buf, s32 count)
        case SI_HOSTNAME:
                r = buffer + 256;
                down_read(&uts_sem);
-               for (p = system_utsname.nodename, q = buffer; 
+               for (p = vx_new_uts(nodename), q = buffer;
                     q < r && *p && *p != '.'; *q++ = *p++);
                up_read(&uts_sem);
                *q = 0;
@@ -334,7 +354,7 @@ asmlinkage int solaris_sysconf(int id)
 {
        switch (id) {
        case SOLARIS_CONFIG_NGROUPS:    return NGROUPS_MAX;
-       case SOLARIS_CONFIG_CHILD_MAX:  return CHILD_MAX;
+       case SOLARIS_CONFIG_CHILD_MAX:  return -1; /* no limit */
        case SOLARIS_CONFIG_OPEN_FILES: return OPEN_MAX;
        case SOLARIS_CONFIG_POSIX_VER:  return 199309;
        case SOLARIS_CONFIG_PAGESIZE:   return PAGE_SIZE;
@@ -718,7 +738,8 @@ MODULE_LICENSE("GPL");
 extern u32 tl0_solaris[8];
 #define update_ttable(x)                                                                               \
        tl0_solaris[3] = (((long)(x) - (long)tl0_solaris - 3) >> 2) | 0x40000000;                       \
-       __asm__ __volatile__ ("membar #StoreStore; flush %0" : : "r" (&tl0_solaris[3]))
+       wmb();          \
+       __asm__ __volatile__ ("flush %0" : : "r" (&tl0_solaris[3]))
 #else
 #endif 
 
@@ -742,7 +763,8 @@ int init_module(void)
        entry64_personality_patch |=
                (offsetof(struct task_struct, personality) +
                 (sizeof(unsigned long) - 1));
-       __asm__ __volatile__("membar #StoreStore; flush %0"
+       wmb();
+       __asm__ __volatile__("flush %0"
                             : : "r" (&entry64_personality_patch));
        return 0;
 }