Update of /cvsroot/linux-hls/hls/hls
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27996/hls
Modified Files:
hls_init.c hls_sched_th.c
Log Message:
- Commit the 2.6 gensched patch
- Update the linux-2.6 dir (compiles and inserts, but crashes)
Index: hls_init.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/hls/hls_init.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** hls_init.c 13 Dec 2003 12:27:15 -0000 1.1
--- hls_init.c 9 Oct 2004 10:26:55 -0000 1.2
***************
*** 40,43 ****
--- 40,44 ----
}
+ #ifdef __INTERNAL_SCHEDULERS__
static void CreateSimpleHierarchy (void)
{
***************
*** 83,86 ****
--- 84,88 ----
#endif
}
+ #endif
void HLSInit (void)
Index: hls_sched_th.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/hls/hls_sched_th.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** hls_sched_th.c 8 Nov 2003 10:34:31 -0000 1.7
--- hls_sched_th.c 9 Oct 2004 10:26:55 -0000 1.8
***************
*** 197,201 ****
/* FIXME: This field is arch dependent! */
/* ((PKTHREAD)body->Thread)->private_data = (void *)Inst; */
! HLS_DATA((PKTHREAD)body->Thread) = (void *)Inst;
Inst->vp->BottomSched = body->Self;
--- 197,201 ----
/* FIXME: This field is arch dependent! */
/* ((PKTHREAD)body->Thread)->private_data = (void *)Inst; */
! HLS_DATA(body->Thread) = (void *)Inst;
Inst->vp->BottomSched = body->Self;
***************
*** 271,274 ****
--- 271,275 ----
#ifdef HLS_DEBUG
+ #if 0 /* Still have to understand what to do here... */
static struct TH_INSTANCE_DATA *SItoID (struct HLS_SCHED_INSTANCE *si)
{
***************
*** 278,282 ****
}
- #if 0 /* Still have to understand what to do here... */
static int ThreadCurrentCount (PRKTHREAD Thread)
{
--- 279,282 ----
|
