Re: [patch] CFS scheduler, -v17

From: Ingo Molnar
Date: Fri Jun 15 2007 - 15:35:37 EST



* Ludovic Vaugeois-Pepin <ludovicvp@xxxxxxxxx> wrote:

> >kernel/built-in.o:sched.c:(.text+0x407b): more undefined references to
> >`cpu_of' follow
> >make: *** [.tmp_vmlinux1] Error 1
> >
> >I attached the .config file (config-2.6.22-rc4-cfs17)
> >
> >--
> >Ludovic Vaugeois-Pepin
> >
> >
>
> Here is the config :

thx - this too has !CONFIG_SMP - please apply the fix below or
re-download the v17 patch.

Ingo

Index: linux-cfs-2.6.22-rc4.q/kernel/sched.c
===================================================================
--- linux-cfs-2.6.22-rc4.q.orig/kernel/sched.c
+++ linux-cfs-2.6.22-rc4.q/kernel/sched.c
@@ -248,6 +249,15 @@ static unsigned int static_prio_timeslic
return SCALE_PRIO(DEF_TIMESLICE, static_prio);
}

+static inline int cpu_of(struct rq *rq)
+{
+#ifdef CONFIG_SMP
+ return rq->cpu;
+#else
+ return 0;
+#endif
+}
+
#ifdef CONFIG_SMP
/*
* Divide a load by a sched group cpu_power : (load / sg->__cpu_power)
@@ -258,15 +268,6 @@ static inline u32 sg_div_cpu_power(const
return reciprocal_divide(load, sg->reciprocal_cpu_power);
}

-static inline int cpu_of(struct rq *rq)
-{
-#ifdef CONFIG_SMP
- return rq->cpu;
-#else
- return 0;
-#endif
-}
-
/*
* Each time a sched group cpu_power is changed,
* we must compute its reciprocal value
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/