PPC updates: call schedule_tail only on SMP, update sched_find_first_bit,

include <linux/binfmts.h> in signal.c.

diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S
index 8017ce55ca7c802e20d81e96b03997080e612840..35e5c9c1363f53c246f490ae2f6276a29189b8f1 100644 (file)
--- a/arch/ppc/kernel/entry.S
+++ b/arch/ppc/kernel/entry.S
@@ -277,7 +277,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 
        .globl  ret_from_fork
 ret_from_fork:
+#ifdef CONFIG_SMP
        bl      schedule_tail
+#endif
        rlwinm  r3,r1,0,0,18
        lwz     r3,TI_FLAGS(r3)
        andi.   r0,r3,_TIF_SYSCALL_TRACE

diff --git a/arch/ppc/kernel/signal.c b/arch/ppc/kernel/signal.c
index 394d8abb05dc17693b0a440699a25f186a1b0b41..d501cab25ef7a01c058d97d1aed8c23836af2950 100644 (file)
--- a/arch/ppc/kernel/signal.c
+++ b/arch/ppc/kernel/signal.c
@@ -30,6 +30,7 @@
 #include <linux/stddef.h>
 #include <linux/elf.h>
 #include <linux/tty.h>
+#include <linux/binfmts.h>
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>

diff --git a/include/asm-ppc/mmu_context.h b/include/asm-ppc/mmu_context.h
index f6628d78af92e77008a0f9d9482be93d5b23a9b2..d55284f76c9cf905e0ab24cc54ccc7f8f0eee00f 100644 (file)
--- a/include/asm-ppc/mmu_context.h
+++ b/include/asm-ppc/mmu_context.h
@@ -10,10 +10,6 @@
 #include <asm/bitops.h>
 #include <asm/mmu.h>
 
-#if MAX_RT_PRIO != 128 || MAX_PRIO != 168
-# error update this function.
-#endif
-
 static inline int sched_find_first_bit(unsigned long *b)
 {
        if (unlikely(b[0]))
@@ -22,11 +18,9 @@ static inline int sched_find_first_bit(unsigned long *b)
                return __ffs(b[1]) + 32;
        if (unlikely(b[2]))
                return __ffs(b[2]) + 64;
-       if (unlikely(b[3]))
+       if (b[3])
                return __ffs(b[3]) + 96;
-       if (b[4])
-               return __ffs(b[4]) + 128;
-       return __ffs(b[5]) + 32 + 128;
+       return __ffs(b[4]) + 128;
 }
 
 /*