Re: [PATCH 2.6.10-mm2] Use the new preemption code [2/3] Resend

[Thomas Gleixner]

On Mon, 2005-01-10 at 08:32, Andrew Morton wrote:
> Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote:
> >
> > This patch adjusts the ARM entry code to use the fixed up
> >  preempt_schedule() handling in 2.6.10-mm2
> > 
> > ...
> >  Index: 2.6.10-mm1/arch/arm/kernel/entry.S
> 
> There's no such file.  I assumed you meant entry-armv.S and ended up with
> the below.

Oops. I messed that up twice. Sure it was entry-armv.S
Sorry. I'm just a perfect example for Murphy's law.

tglx

> --- 25/arch/arm/kernel/entry-armv.S~use-the-new-preemption-code-arm	2005-01-09 23:30:34.794573320 -0800
> +++ 25-akpm/arch/arm/kernel/entry-armv.S	2005-01-09 23:30:34.797572864 -0800
> @@ -136,10 +136,8 @@ svc_preempt:	teq	r9, #0				@ was preempt
>  		ldr	r1, [r6, #8]			@ local_bh_count
>  		adds	r0, r0, r1
>  		movne	pc, lr
> -		mov	r7, #PREEMPT_ACTIVE
> -		str	r7, [r8, #TI_PREEMPT]		@ set PREEMPT_ACTIVE
>  1:		enable_irq r2				@ enable IRQs
> -		bl	schedule
> +               bl      entry_preempt_schedule
>  		disable_irq r0				@ disable IRQs
>  		ldr	r0, [r8, #TI_FLAGS]		@ get new tasks TI_FLAGS
>  		tst	r0, #_TIF_NEED_RESCHED
> _
> 
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/