merge in changes for Sparc

SCCS-vsn: sys/kern/kern_sig.c 7.46
SCCS-vsn: sys/kern/kern_resource.c 7.18
SCCS-vsn: sys/kern/kern_descrip.c 7.35

diff --git a/usr/src/sys/kern/kern_descrip.c b/usr/src/sys/kern/kern_descrip.c
index 7b9c9cb..d325287 100644 (file)
--- a/usr/src/sys/kern/kern_descrip.c
+++ b/usr/src/sys/kern/kern_descrip.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)kern_descrip.c      7.34 (Berkeley) %G%
+ *     @(#)kern_descrip.c      7.35 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -302,7 +302,7 @@ close(p, uap, retval)
        return (closef(fp, p));
 }
 
        return (closef(fp, p));
 }
 

-#ifdef COMPAT_43
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)

 /*
  * Return status information about a file descriptor.
  */
 /*
  * Return status information about a file descriptor.
  */


@@ -335,7 +335,7 @@ ofstat(p, uap, retval)
                break;
 
        default:
                break;
 
        default:

-               panic("fstat");
+               panic("ofstat");

                /*NOTREACHED*/
        }
        cvtstat(&ub, &oub);
                /*NOTREACHED*/
        }
        cvtstat(&ub, &oub);


@@ -343,7 +343,7 @@ ofstat(p, uap, retval)
                error = copyout((caddr_t)&oub, (caddr_t)uap->sb, sizeof (oub));
        return (error);
 }
                error = copyout((caddr_t)&oub, (caddr_t)uap->sb, sizeof (oub));
        return (error);
 }

-#endif /* COMPAT_43 */
+#endif /* COMPAT_43 || COMPAT_SUNOS */

 
 /*
  * Return status information about a file descriptor.
 
 /*
  * Return status information about a file descriptor.

diff --git a/usr/src/sys/kern/kern_resource.c b/usr/src/sys/kern/kern_resource.c
index 97c5742..b6abaf5 100644 (file)
--- a/usr/src/sys/kern/kern_resource.c
+++ b/usr/src/sys/kern/kern_resource.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)kern_resource.c     7.17 (Berkeley) %G%
+ *     @(#)kern_resource.c     7.18 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -153,7 +153,7 @@ donice(curp, chgp, n)
        return (0);
 }
 
        return (0);
 }
 

-#ifdef COMPAT_43
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)

 /* ARGSUSED */
 setrlimit(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 setrlimit(p, uap, retval)
        struct proc *p;


@@ -196,7 +196,7 @@ getrlimit(p, uap, retval)
                olim.rlim_max = 0x7fffffff;
        return (copyout((caddr_t)&olim, (caddr_t)uap->rlp, sizeof(olim)));
 }
                olim.rlim_max = 0x7fffffff;
        return (copyout((caddr_t)&olim, (caddr_t)uap->rlp, sizeof(olim)));
 }

-#endif /* COMPAT_43 */
+#endif /* COMPAT_43 || COMPAT_SUNOS */

 
 /* ARGSUSED */
 __setrlimit(p, uap, retval)
 
 /* ARGSUSED */
 __setrlimit(p, uap, retval)

diff --git a/usr/src/sys/kern/kern_sig.c b/usr/src/sys/kern/kern_sig.c
index 50b18e4..8ecb8ea 100644 (file)
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)kern_sig.c  7.45 (Berkeley) %G%
+ *     @(#)kern_sig.c  7.46 (Berkeley) %G%

  */
 
 #define        SIGPROP         /* include signal properties table */
  */
 
 #define        SIGPROP         /* include signal properties table */


@@ -291,11 +291,11 @@ osigvec(p, uap, retval)
                        return (error);
 #ifdef COMPAT_SUNOS
                /*
                        return (error);
 #ifdef COMPAT_SUNOS
                /*

-                * SunOS uses this bit (SA_NOCLDSTOP) as SV_RESETHAND,
-                * `reset to SIG_DFL on delivery'. We have no such
-                * option now or ever!
+                * SunOS uses this bit (4, aka SA_DISABLE) as SV_RESETHAND,
+                * `reset to SIG_DFL on delivery'. We have no such option
+                * now or ever!

                 */
                 */

-               if (sv->sv_flags & SA_NOCLDSTOP)
+               if (sv->sv_flags & SA_DISABLE)

                        return (EINVAL);
                sv->sv_flags |= SA_USERTRAMP;
 #endif
                        return (EINVAL);
                sv->sv_flags |= SA_USERTRAMP;
 #endif


@@ -334,7 +334,7 @@ osigsetmask(p, uap, retval)
        (void) spl0();
        return (0);
 }
        (void) spl0();
        return (0);
 }

-#endif
+#endif /* COMPAT_43 || COMPAT_SUNOS */

 
 /*
  * Suspend process until signal, providing mask to be set
 
 /*
  * Suspend process until signal, providing mask to be set


@@ -366,7 +366,7 @@ sigsuspend(p, uap, retval)
        return (EINTR);
 }
 
        return (EINTR);
 }
 

-#ifdef COMPAT_43
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)

 /* ARGSUSED */
 osigstack(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 osigstack(p, uap, retval)
        struct proc *p;


@@ -395,7 +395,7 @@ osigstack(p, uap, retval)
        }
        return (error);
 }
        }
        return (error);
 }

-#endif /* COMPAT_43 */
+#endif /* COMPAT_43 || COMPAT_SUNOS */

 
 /* ARGSUSED */
 sigaltstack(p, uap, retval)
 
 /* ARGSUSED */
 sigaltstack(p, uap, retval)


@@ -484,7 +484,7 @@ okillpg(p, uap, retval)
                return (EINVAL);
        return (killpg1(p, uap->signo, uap->pgid, 0));
 }
                return (EINVAL);
        return (killpg1(p, uap->signo, uap->pgid, 0));
 }

-#endif
+#endif /* COMPAT_43 || COMPAT_SUNOS */

 
 /*
  * Common code for kill process group/broadcast kill.
 
 /*
  * Common code for kill process group/broadcast kill.