linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/arch/sparc64/solaris/misc.c b/arch/sparc64/solaris/misc.c
index ebd4207..2944287 100644 (file)
--- a/arch/sparc64/solaris/misc.c
+++ b/arch/sparc64/solaris/misc.c
@@ -4,6 +4,7 @@
  * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  */
 
+#include <linux/config.h>
 #include <linux/module.h> 
 #include <linux/types.h>
 #include <linux/smp_lock.h>
@@ -11,7 +12,6 @@
 #include <linux/limits.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
-#include <linux/tty.h>
 #include <linux/mman.h>
 #include <linux/file.h>
 #include <linux/timex.h>
@@ -24,7 +24,6 @@
 #include <asm/oplib.h>
 #include <asm/idprom.h>
 #include <asm/smp.h>
-#include <asm/prom.h>
 
 #include "conv.h"
 
@@ -92,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 > STACK_TOP32 || addr > STACK_TOP32 - len)
+       else if (len > 0xf0000000UL || addr > 0xf0000000UL - len)
                goto out_putf;
        ret_type = flags & _MAP_NEW;
        flags &= ~_MAP_NEW;
@@ -104,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 < STACK_TOP32) ? 0 : retval);
+               retval = ((retval < 0xf0000000) ? 0 : retval);
                                
 out_putf:
        if (file)
@@ -196,17 +195,14 @@ static char *machine(void)
        }
 }
 
-static char *platform(char *buffer, int sz)
+static char *platform(char *buffer)
 {
-       struct device_node *dp = of_find_node_by_path("/");
        int len;
 
        *buffer = 0;
-       len = strlen(dp->name);
-       if (len > sz)
-               len = sz;
-       memcpy(buffer, dp->name, len);
-       buffer[len] = 0;
+       len = prom_getproperty(prom_root_node, "name", buffer, 256);
+       if(len > 0)
+               buffer[len] = 0;
        if (*buffer) {
                char *p;
 
@@ -218,22 +214,16 @@ static char *platform(char *buffer, int sz)
        return "sun4u";
 }
 
-static char *serial(char *buffer, int sz)
+static char *serial(char *buffer)
 {
-       struct device_node *dp = of_find_node_by_path("/options");
+       int node = prom_getchild(prom_root_node);
        int len;
 
+       node = prom_searchsiblings(node, "options");
        *buffer = 0;
-       if (dp) {
-               char *val = of_get_property(dp, "system-board-serial#", &len);
-
-               if (val && len > 0) {
-                       if (len > sz)
-                               len = sz;
-                       memcpy(buffer, val, len);
-                       buffer[len] = 0;
-               }
-       }
+       len = prom_getproperty(node, "system-board-serial#", buffer, 256);
+       if(len > 0)
+               buffer[len] = 0;
        if (!*buffer)
                return "4512348717234";
        else
@@ -316,8 +306,8 @@ asmlinkage int solaris_sysinfo(int cmd, u32 buf, s32 count)
        case SI_MACHINE: r = machine(); break;
        case SI_ARCHITECTURE: r = "sparc"; break;
        case SI_HW_PROVIDER: r = "Sun_Microsystems"; break;
-       case SI_HW_SERIAL: r = serial(buffer, sizeof(buffer)); break;
-       case SI_PLATFORM: r = platform(buffer, sizeof(buffer)); break;
+       case SI_HW_SERIAL: r = serial(buffer); break;
+       case SI_PLATFORM: r = platform(buffer); break;
        case SI_SRPC_DOMAIN: r = ""; break;
        case SI_VERSION: r = "Generic"; break;
        default: return -EINVAL;
@@ -424,7 +414,7 @@ asmlinkage int solaris_procids(int cmd, s32 pid, s32 pgid)
                           Solaris setpgrp and setsid? */
                        ret = sys_setpgid(0, 0);
                        if (ret) return ret;
-                       proc_clear_tty(current);
+                       current->signal->tty = NULL;
                        return process_group(current);
                }
        case 2: /* getsid */