[Linux-hls-cvs] hls/linux bottom.c,1.7,1.8 m,1.1.1.1,1.2

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

Update of /cvsroot/linux-hls/hls/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv8454

Modified Files:
	bottom.c m 
Log Message:
Fix bug reported by Paul: if a task changed to SCHED_FIFO, it was not possible
to return HLS again...


Index: bottom.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux/bottom.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** bottom.c	25 Feb 2003 09:18:55 -0000	1.7
--- bottom.c	28 Aug 2003 19:52:23 -0000	1.8
***************
*** 315,321 ****
--- 315,325 ----
    if (policy != SCHED_HLS) {
      if (p->private_data != NULL) {
+ #ifdef NOLINUX_TASKS
+       printk("Policy %d != SCHED_HLS. Doing nothing...\n", policy);
+ #else
        HLSExitThreadHook(p);
        p->policy = SCHED_OTHER;
        p->private_data = NULL;
+ #endif
      }
      
***************
*** 349,355 ****
--- 353,365 ----
    if (p->private_data == NULL) {
      printk("HLS Error: %d has private_data = NULL???\n", p->pid);
+ #ifdef NOLINUX_TASKS
      spin_unlock_irqrestore(&hls_lock, flags);
  
      return -EINVAL;
+ #else
+     p->policy = SCHED_FIFO;
+     p->rt_priority = HLS_IDLE_PRIORITY;
+     HLSCreateThreadHook(p, p->state);
+ #endif
    }
    

Index: m
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux/m,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** m	27 Aug 2002 11:26:20 -0000	1.1.1.1
--- m	28 Aug 2003 19:52:23 -0000	1.2
***************
*** 1 ****
! make KERNEL_DIR=/home/luca/src/linux CLI=1 MULDIV=1
--- 1 ----
! make KERNEL_DIR=/home/luca/src/linux-rt CLI=1 MULDIV=1