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

[Russell King]

On Mon, Jan 10, 2005 at 01:53:26AM +0100, Thomas Gleixner wrote:
> This patch adjusts the ARM entry code to use the fixed up
> preempt_schedule() handling in 2.6.10-mm2

Looks PPCish to me.

> Signed-off-by: Benedikt Spranger <bene@xxxxxxxxxxxxx>
> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> 
> ---
>  entry-armv.S |    4 +---
>  1 files changed, 1 insertion(+), 3 deletions(-)
> ---
> Index: 2.6.10-mm1/arch/ppc/kernel/entry.S
> ===================================================================
> --- 2.6.10-mm1/arch/ppc/kernel/entry.S	(revision 141)
> +++ 2.6.10-mm1/arch/ppc/kernel/entry.S	(working copy)
> @@ -624,12 +624,12 @@
>  	beq+	restore
>  	andi.	r0,r3,MSR_EE	/* interrupts off? */
>  	beq	restore		/* don't schedule if so */
> -1:	lis	r0,PREEMPT_ACTIVE@h
> +1:	li	r0,1
>  	stw	r0,TI_PREEMPT(r9)
>  	ori	r10,r10,MSR_EE
>  	SYNC
>  	MTMSRD(r10)		/* hard-enable interrupts */
> -	bl	schedule
> +	bl	entry_preempt_schedule
>  	LOAD_MSR_KERNEL(r10,MSR_KERNEL)
>  	SYNC
>  	MTMSRD(r10)		/* disable interrupts */
> 
> 
> -
> 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/

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 PCMCIA      - http://pcmcia.arm.linux.org.uk/
                 2.6 Serial core
-
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/