* Jeremy Kerr <j...@ozlabs.org> [2014-02-11 14:05:17]:
> Current ppc64_defconfig fails with:
>
> arch/powerpc/platforms/cell/spufs/sched.c:86:0: error: "MAX_USER_PRIO"
> redefined [-Werror]
> cc1: all warnings being treated as errors
>
> 6b6350f1 introduced a generic MAX_USER_PRIO macro to sched/prio.h, which
> is causing the conflit. Use that one instead of our own.
you can also use DEFAULT_PRIO from sched/prio.h instead of NORMAL_PRIO.
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c
b/arch/powerpc/platforms/cell/spufs/sched.c
index 49318385d4fa..014979db2018 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -64,11 +64,6 @@ static struct timer_list spusched_timer;
static struct timer_list spuloadavg_timer;
/*
- * Priority of a normal, non-rt, non-niced'd process (aka nice level 0).
- */
-#define NORMAL_PRIO 120
-
-/*
* Frequency of the spu scheduler tick. By default we do one SPU scheduler
* tick for every 10 CPU scheduler ticks.
*/
@@ -97,7 +92,7 @@ static struct timer_list spuloadavg_timer;
*/
void spu_set_timeslice(struct spu_context *ctx)
{
- if (ctx->prio < NORMAL_PRIO)
+ if (ctx->prio < DEFAULT_PRIO)
ctx->time_slice = SCALE_PRIO(DEF_SPU_TIMESLICE * 4, ctx->prio);
else
ctx->time_slice = SCALE_PRIO(DEF_SPU_TIMESLICE, ctx->prio);
Thanks,
Kamalesh.
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
