WebSVN - shark - Path Comparison - /shark/trunk/ Rev 320 and /shark/trunk Rev 319

Ignore whitespace Rev 320 → Rev 319

 /shark/trunk/kernel/conditio.c
 ,11 → 20,11
 /**
  ------------
- CVS :        $Id: conditio.c,v 1.5 2003-11-06 08:55:53 giacomo Exp $
+ CVS :        $Id: conditio.c,v 1.4 2003-11-05 15:05:11 giacomo Exp $
  File:        $File$
- Revision:    $Revision: 1.5 $
- Last update: $Date: 2003-11-06 08:55:53 $
+ Revision:    $Revision: 1.4 $
+ Last update: $Date: 2003-11-05 15:05:11 $
  ------------
 This file contains the condition variables handling functions.
 ,7 → 217,6
   exec = exec_shadow = -1;
   scheduler();
   ll_context_to(proc_table[exec_shadow].context);
-  kern_sti();
   /* when we arrive here:
      - the task did't die while it was waiting on the condition
 ,7 → 340,6
   if (proc_table[exec_shadow].delay_timer != -1)
     kern_event_delete(proc_table[exec_shadow].delay_timer);
-  kern_sti();
   /* when we arrive here:
      - the task did't die while it was waiting on the condition
        (normally, the cancelability state is set to deferred;

 /shark/trunk/kernel/signal.c
 ,11 → 18,11
 /**
  ------------
- CVS :        $Id: signal.c,v 1.6 2003-11-06 08:56:08 giacomo Exp $
+ CVS :        $Id: signal.c,v 1.5 2003-11-05 15:05:12 giacomo Exp $
  File:        $File$
- Revision:    $Revision: 1.6 $
- Last update: $Date: 2003-11-06 08:56:08 $
+ Revision:    $Revision: 1.5 $
+ Last update: $Date: 2003-11-05 15:05:12 $
  ------------
  This file contains:
 ,7 → 1305,6
         sigdelset(&task->sigpending, sig);
         task->sigmask = sigmask;
-        kern_sti();
         /*
          * and call the handler ...
          */
 ,8 → 1317,7
         /* NB: when we pass the kern_cli(), there can be the case that
            an irq (and/or a timer...) fired... and do a context change.
            so, we return here after an indefinite time... */
-        kern_cli();
-        task->sigmask = oldmask;
+        task->sigmask = oldmask;
         kern_frestore(f);
 }