[Linux-hls-cvs] hls/linux-2.6 Makefile,1.2,1.3 bottom.c,1.2,1.3 init.c,1.2,1.3

[Luca A. <lu...@us...>]

Update of /cvsroot/linux-hls/hls/linux-2.6
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5235/linux-2.6

Modified Files:
	Makefile bottom.c init.c 
Log Message:
- Update the 2.6 backend...
  Now it inserts without big crashes, but still does not work
  Check if it breaks 2.4 (there is a pre_26 tag)


Index: init.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux-2.6/init.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** init.c	9 Oct 2004 10:26:56 -0000	1.2
--- init.c	2 Nov 2004 07:39:29 -0000	1.3
***************
*** 86,90 ****
    }
      
-   read_lock(&tasklist_lock);
    do_each_thread(dummy, t) {
  #ifdef __FP_DEAMONS__
--- 86,89 ----
***************
*** 130,134 ****
  #endif
    } while_each_thread(dummy, t);
-   read_unlock(&tasklist_lock);
  }
  
--- 129,132 ----
***************
*** 138,142 ****
  
    t = current;  
-   read_lock(&tasklist_lock);
    do_each_thread(dummy, t) {
      if (t->private_data != NULL) {
--- 136,139 ----
***************
*** 153,157 ****
      }
    } while_each_thread(dummy, t);
-   read_unlock(&tasklist_lock);
  }
  
--- 150,153 ----

Index: bottom.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux-2.6/bottom.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** bottom.c	9 Oct 2004 10:26:56 -0000	1.2
--- bottom.c	2 Nov 2004 07:39:29 -0000	1.3
***************
*** 100,103 ****
--- 100,104 ----
      printk("HLS ERROR: Trying to schedule %d with state = %ld\n",
  		    t->pid, t->state);
+     BUG();
    }
  }
***************
*** 177,181 ****
    hls_printk("HLS parameter is: 0x%lx\n", (unsigned long int)t->hls);
  #endif
!   if (t->state != TASK_UNINTERRUPTIBLE) {
      printk("HLS ERROR: Creating task with unexpected state: %ld\n", t->state);
      hls_printk("HLS ERROR: Creating task with unexpected state: %ld\n", t->state);
--- 178,182 ----
    hls_printk("HLS parameter is: 0x%lx\n", (unsigned long int)t->hls);
  #endif
!   if (t->state != TASK_RUNNING) {
      printk("HLS ERROR: Creating task with unexpected state: %ld\n", t->state);
      hls_printk("HLS ERROR: Creating task with unexpected state: %ld\n", t->state);
***************
*** 229,233 ****
    active = 0;
  
-   read_lock(&tasklist_lock);
    do_each_thread(dummy, t) {
  #ifdef VERBOSE1
--- 230,233 ----
***************
*** 260,264 ****
  #endif
    } while_each_thread(dummy, t);
-   read_unlock(&tasklist_lock);
  #if 0
    if (active > 1) {
--- 260,263 ----

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux-2.6/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	9 Oct 2004 10:26:56 -0000	1.2
--- Makefile	2 Nov 2004 07:39:29 -0000	1.3
***************
*** 10,14 ****
  HLS = $(SUBDIRS)/..
  HLS = $(M)/..
! EXTRA_CFLAGS += -D__HARD_PANIC__ -I $(HLS)/hls/include -I $(HLS)/linux-2.6/include
  
  ifdef DEBUG
--- 10,15 ----
  HLS = $(SUBDIRS)/..
  HLS = $(M)/..
! #EXTRA_CFLAGS += -D__HARD_PANIC__ -I $(HLS)/hls/include -I $(HLS)/linux-2.6/include
! EXTRA_CFLAGS += -D__HARD_PANIC__ -g -I $(HLS)/hls/include -I $(HLS)/linux-2.6/include
  
  ifdef DEBUG