WebSVN - shark - Path Comparison - /shark/trunk/ Rev 566 and /shark/trunk/ Rev 565

Ignore whitespace Rev 566 → Rev 565

 /shark/trunk/kernel/kern.c
 ,11 → 18,11
 /**
  ------------
- CVS :        $Id: kern.c,v 1.10 2004-04-18 18:59:28 giacomo Exp $
+ CVS :        $Id: kern.c,v 1.9 2004-03-31 10:40:24 giacomo Exp $
  File:        $File$
- Revision:    $Revision: 1.10 $
- Last update: $Date: 2004-04-18 18:59:28 $
+ Revision:    $Revision: 1.9 $
+ Last update: $Date: 2004-03-31 10:40:24 $
  ------------
  This file contains:
 ,11 → 574,6
        We do nothing for user tasks that remain active (because, for example,
        they have the cancelability set to deferred) when the system goes to
        runlevel 3 */
-    struct timespec t = {SYSTEM_CLOSE_TIMEOUT,0};
-    kern_event_post(&t,(void *)((void *)sys_abort),NULL);
     //kern_printf("Û%lu",kern_gettime(NULL));
     kill_user_tasks();
     //kern_printf("Û%lu",kern_gettime(NULL));
 ,8 → 703,6
 {
   SYS_FLAGS f;
-  cprintf("SYS-END\n");
   f = kern_fsave();
   internal_sys_end(err);
   kern_frestore(f);

 /shark/trunk/kernel/grpcreat.c
 ,11 → 18,11
 /**
  ------------
- CVS :        $Id: grpcreat.c,v 1.8 2004-04-18 18:59:28 giacomo Exp $
+ CVS :        $Id: grpcreat.c,v 1.7 2004-03-10 14:51:42 giacomo Exp $
  File:        $File$
- Revision:    $Revision: 1.8 $
- Last update: $Date: 2004-04-18 18:59:28 $
+ Revision:    $Revision: 1.7 $
+ Last update: $Date: 2004-03-10 14:51:42 $
  ------------
  This file contains:
 ,9 → 306,9
   //kern_printf("[c%i %i]",i,proc_table[i].context);
   /* Count the task if it is an Application or System Task... */
-  if (m->control & SYSTEM_TASK)
+  if (!(m->control & SYSTEM_TASK))
     task_counter++;
-  else if (m->control & NO_KILL)
+  else if (!(m->control & NO_KILL))
     system_counter++;
   return 0;