Thread (1 message) 1 message, 1 author, 2014-02-11
DORMANTno replies

[PATCH] powerpc/spufs: Fix duplicate definition of MAX_USER_PRIO

From: Peter Zijlstra <peterz@infradead.org>
Date: 2014-02-11 09:42:07
Also in: lkml
Subsystem: cell broadband engine architecture, linux for powerpc (32-bit and 64-bit), spu file system, the rest · Maintainers: Madhavan Srinivasan, Linus Torvalds

On Tue, Feb 11, 2014 at 03:24:17AM +0800, kbuild test robot wrote:
quoted
quoted
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 <redacted>
Signed-off-by: Peter Zijlstra <peterz@infradead.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)
 
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help