diff options
| author | Paul Mackerras <paulus@cargo.(none)> | 2002-02-13 18:28:44 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@cargo.(none)> | 2002-02-13 18:28:44 +1100 |
| commit | 0cbf5ed15dad64bc5caa6474bf3c185919df6b87 (patch) | |
| tree | 9ad95c4309c19da5341d6f52dd4540ec57264d98 | |
| parent | 59790c7499a335fe0f8e583453df1237941d22df (diff) | |
PPC updates: call schedule_tail only on SMP, update sched_find_first_bit,
include <linux/binfmts.h> in signal.c.
| -rw-r--r-- | arch/ppc/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/ppc/kernel/signal.c | 1 | ||||
| -rw-r--r-- | include/asm-ppc/mmu_context.h | 10 |
3 files changed, 5 insertions, 8 deletions
diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S index 8017ce55ca7c..35e5c9c1363f 100644 --- 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 394d8abb05dc..d501cab25ef7 100644 --- 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 f6628d78af92..d55284f76c9c 100644 --- 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; } /* |