From: Thomas Gleixner Make use of the new preempt_schedule_irq function. Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton --- 25-akpm/arch/ppc/kernel/entry.S | 12 +----------- 1 files changed, 1 insertion(+), 11 deletions(-) diff -puN arch/ppc/kernel/entry.S~sched-make-use-of-preempt_schedule_irq-ppc arch/ppc/kernel/entry.S --- 25/arch/ppc/kernel/entry.S~sched-make-use-of-preempt_schedule_irq-ppc 2005-01-23 14:47:03.352687480 -0800 +++ 25-akpm/arch/ppc/kernel/entry.S 2005-01-23 14:47:03.356686872 -0800 @@ -659,18 +659,8 @@ resume_kernel: beq+ restore andi. r0,r3,MSR_EE /* interrupts off? */ beq restore /* don't schedule if so */ -1: lis r0,PREEMPT_ACTIVE@h - stw r0,TI_PREEMPT(r9) - ori r10,r10,MSR_EE - SYNC - MTMSRD(r10) /* hard-enable interrupts */ - bl schedule - LOAD_MSR_KERNEL(r10,MSR_KERNEL) - SYNC - MTMSRD(r10) /* disable interrupts */ +1: bl preempt_schedule_irq rlwinm r9,r1,0,0,18 - li r0,0 - stw r0,TI_PREEMPT(r9) lwz r3,TI_FLAGS(r9) andi. r0,r3,_TIF_NEED_RESCHED bne- 1b _