Commit 0cbf5ed1 authored by Paul Mackerras's avatar Paul Mackerras

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

include <linux/binfmts.h> in signal.c.
parent 59790c74
...@@ -277,7 +277,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) ...@@ -277,7 +277,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
.globl ret_from_fork .globl ret_from_fork
ret_from_fork: ret_from_fork:
#ifdef CONFIG_SMP
bl schedule_tail bl schedule_tail
#endif
rlwinm r3,r1,0,0,18 rlwinm r3,r1,0,0,18
lwz r3,TI_FLAGS(r3) lwz r3,TI_FLAGS(r3)
andi. r0,r3,_TIF_SYSCALL_TRACE andi. r0,r3,_TIF_SYSCALL_TRACE
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/elf.h> #include <linux/elf.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/binfmts.h>
#include <asm/ucontext.h> #include <asm/ucontext.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
......
...@@ -10,10 +10,6 @@ ...@@ -10,10 +10,6 @@
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/mmu.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) static inline int sched_find_first_bit(unsigned long *b)
{ {
if (unlikely(b[0])) if (unlikely(b[0]))
...@@ -22,11 +18,9 @@ static inline int sched_find_first_bit(unsigned long *b) ...@@ -22,11 +18,9 @@ static inline int sched_find_first_bit(unsigned long *b)
return __ffs(b[1]) + 32; return __ffs(b[1]) + 32;
if (unlikely(b[2])) if (unlikely(b[2]))
return __ffs(b[2]) + 64; return __ffs(b[2]) + 64;
if (unlikely(b[3])) if (b[3])
return __ffs(b[3]) + 96; return __ffs(b[3]) + 96;
if (b[4])
return __ffs(b[4]) + 128; return __ffs(b[4]) + 128;
return __ffs(b[5]) + 32 + 128;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment