always set sig, no need to test catch, makes gcc happy

SCCS-vsn: sys/kern/kern_synch.c 7.20

diff --git a/usr/src/sys/kern/kern_synch.c b/usr/src/sys/kern/kern_synch.c
index 0c4dbbc..52ab4b0 100644 (file)
--- a/usr/src/sys/kern/kern_synch.c
+++ b/usr/src/sys/kern/kern_synch.c
@@ -5,7 +5,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)kern_synch.c        7.19 (Berkeley) %G%
+ *     @(#)kern_synch.c        7.20 (Berkeley) %G%

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


@@ -301,7 +301,8 @@ tsleep(chan, pri, wmesg, timo)
                        catch = 0;
                        goto resume;
                }
                        catch = 0;
                        goto resume;
                }

-       }
+       } else
+               sig = 0;

        p->p_stat = SSLEEP;
        p->p_stats->p_ru.ru_nvcsw++;
        swtch();
        p->p_stat = SSLEEP;
        p->p_stats->p_ru.ru_nvcsw++;
        swtch();


@@ -311,7 +312,7 @@ resume:
        p->p_flag &= ~SSINTR;
        if (p->p_flag & STIMO) {
                p->p_flag &= ~STIMO;
        p->p_flag &= ~SSINTR;
        if (p->p_flag & STIMO) {
                p->p_flag &= ~STIMO;

-               if (catch == 0 || sig == 0) {
+               if (sig == 0) {

 #ifdef KTRACE
                        if (KTRPOINT(p, KTR_CSW))
                                ktrcsw(p->p_tracep, 0, 0);
 #ifdef KTRACE
                        if (KTRPOINT(p, KTR_CSW))
                                ktrcsw(p->p_tracep, 0, 0);