Merge branch 'p/anton.e/master' of git:projects/modsched/freebsd into p/jkrieg/master
authorJens Krieg <jkrieg@mailbox.tu-berlin.de>
Mon, 27 Jan 2014 15:53:21 +0000 (16:53 +0100)
committerJens Krieg <jkrieg@mailbox.tu-berlin.de>
Mon, 27 Jan 2014 15:53:21 +0000 (16:53 +0100)
Conflicts:
sys/kern/subr_sleepqueue.c

1  2 
sys/kern/kern_fork.c

@@@ -998,13 -998,9 +998,13 @@@ fork_exit(void (*callout)(void *, struc
  //    register_t rflags;
  //    rflags = intr_disable();
  //    intr_restore(rflags);
      enable_intr();
//    enable_intr();
  
        printf("fork_exit thread %s\n", td->td_name);
 +      if (!strcmp(td->td_name, "init")) {
 +              printf("fork_exit start init\n", td->td_name);
 +              bugChecker++;
 +      }
  
        /*
         * cpu_set_fork_handler intercepts this function call to