[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20140211094106.GM27965@twins.programming.kicks-ass.net>
Date: Tue, 11 Feb 2014 10:41:06 +0100
From: Peter Zijlstra <peterz@...radead.org>
To: kbuild test robot <fengguang.wu@...el.com>
Cc: Dongsheng Yang <yangds.fnst@...fujitsu.com>,
Ingo Molnar <mingo@...nel.org>, kbuild-all@...org,
Arnd Bergmann <arnd@...db.de>, linuxppc-dev@...ts.ozlabs.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] powerpc/spufs: Fix duplicate definition of MAX_USER_PRIO
On Tue, Feb 11, 2014 at 03:24:17AM +0800, kbuild test robot wrote:
> >> arch/powerpc/platforms/cell/spufs/sched.c:86:0: warning: "MAX_USER_PRIO" redefined [enabled by default]
> #define MAX_USER_PRIO (MAX_PRIO - MAX_RT_PRIO)
> ^
> In file included from include/linux/sched.h:6:0,
> from arch/powerpc/platforms/cell/spufs/sched.c:26:
> include/linux/sched/prio.h:39:0: note: this is the location of the previous definition
> #define MAX_USER_PRIO (USER_PRIO(MAX_PRIO))
> ^
Since USER_PRIO(p) is ((p)-MAX_RT_PRIO) the above two definitions are
the same and we can simply remove the spufs one.
Fixes: 6b6350f155af ("sched: Expose some macros related to priority")
Reported-by: Fengguang Wu <fengguang.wu@...el.com>
Signed-off-by: Peter Zijlstra <peterz@...radead.org>
---
arch/powerpc/platforms/cell/spufs/sched.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 49318385d4fa..4a0a64fe25df 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -83,7 +83,6 @@ static struct timer_list spuloadavg_timer;
#define MIN_SPU_TIMESLICE max(5 * HZ / (1000 * SPUSCHED_TICK), 1)
#define DEF_SPU_TIMESLICE (100 * HZ / (1000 * SPUSCHED_TICK))
-#define MAX_USER_PRIO (MAX_PRIO - MAX_RT_PRIO)
#define SCALE_PRIO(x, prio) \
max(x * (MAX_PRIO - prio) / (MAX_USER_PRIO / 2), MIN_SPU_TIMESLICE)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists