X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fblock%2Fckrm-io.c;h=960407edf13c01a5fdeacd4704610147e3c8fa66;hb=1348e1532a9457f1f4d6c4d443d3318bed9ea647;hp=7edfce72796dbca5a7821d8475c54e66b52399cd;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/drivers/block/ckrm-io.c b/drivers/block/ckrm-io.c
index 7edfce727..960407edf 100644
--- a/drivers/block/ckrm-io.c
+++ b/drivers/block/ckrm-io.c
@@ -93,10 +93,6 @@ static inline int cki_div(int *a, int b, int c);
 //static inline int cki_recalc(cki_icls_t *icls, int rel2abs);
 static void cki_recalc_propagate(cki_icls_t *res, cki_icls_t *parres);
 
-/* External functions e.g. interface to ioscheduler */
-void *cki_tsk_icls (struct task_struct *tsk);
-int cki_tsk_ioprio (struct task_struct *tsk);
-
 extern void cki_cfq_set(icls_tsk_t tskicls, icls_ioprio_t tskioprio);
 
 /* CKRM Resource Controller API functions */
@@ -523,7 +519,7 @@ static void cki_chgcls(void *tsk, void *oldres, void *newres)
 
 
 struct ckrm_res_ctlr cki_rcbs = {
-	.res_name = "io",
+	.res_name = "cki",
 	.res_hdepth = 1,
 	.resid = -1,
 	.res_alloc = cki_alloc,