linux-rt-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH][RT][PPC64] Fix a previously reverted "fix"
@ 2008-07-10 17:04 Chirag Jog
  2008-07-11  8:02 ` Sebastien Dugue
  0 siblings, 1 reply; 2+ messages in thread
From: Chirag Jog @ 2008-07-10 17:04 UTC (permalink / raw)
  To: Steven Rostedt, linux-rt-users
  Cc: Timothy R. Chavez, Nivedita Singhvi, Josh Triplett,
	Sebastien Dugue


This patch reintroduces a "fix" that got reverted.
Here was the original patch http://lkml.org/lkml/2007/5/22/133

Here is the new patch
This patch also fixes OOPS reported here: http://lkml.org/lkml/2008/6/19/146

>From tsutomu.owa@toshiba.co.jp
Signed-Off-By: Chirag <chirag@linux.vnet.ibm.com>



--- linux-2.6.25.8-rt7/arch/powerpc/kernel/entry_64.S	2008-07-10 16:37:17.000000000 +0000
+++ linux-2.6.25.8-rt7.mod/arch/powerpc/kernel/entry_64.S	2008-07-10 07:58:56.000000000 +0000
@@ -579,14 +579,9 @@ do_work:
 	cmpdi	r0,0
 	crandc	eq,cr1*4+eq,eq
 	bne	restore
-	/* here we are preempting the current task */
 1:
-	li	r0,1
-	stb	r0,PACASOFTIRQEN(r13)
-	stb	r0,PACAHARDIRQEN(r13)
-	ori	r10,r10,MSR_EE
-	mtmsrd	r10,1		/* reenable interrupts */
-	bl	.preempt_schedule
+	/* preempt_schedule_irq() expects interrupts disabled. */
+	bl	.preempt_schedule_irq
 	mfmsr	r10
 	clrrdi	r9,r1,THREAD_SHIFT
 	rldicl	r10,r10,48,1	/* disable interrupts again */

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH][RT][PPC64] Fix a previously reverted "fix"
  2008-07-10 17:04 [PATCH][RT][PPC64] Fix a previously reverted "fix" Chirag Jog
@ 2008-07-11  8:02 ` Sebastien Dugue
  0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Dugue @ 2008-07-11  8:02 UTC (permalink / raw)
  To: Chirag Jog
  Cc: Steven Rostedt, linux-rt-users, Timothy R. Chavez,
	Nivedita Singhvi, Josh Triplett

  Hi Chirag,

On Thu, 10 Jul 2008 22:34:56 +0530 Chirag Jog <chirag@linux.vnet.ibm.com> wrote:

> 
> This patch reintroduces a "fix" that got reverted.
> Here was the original patch http://lkml.org/lkml/2007/5/22/133
> 
> Here is the new patch
> This patch also fixes OOPS reported here: http://lkml.org/lkml/2008/6/19/146
> 
> From tsutomu.owa@toshiba.co.jp
> Signed-Off-By: Chirag <chirag@linux.vnet.ibm.com>

  This indeed fixes the oops we get with matrix_mult, good job.

  You can add my
 
  Tested-by: Sebastien Dugue <sebastien.dugue@bull.net>

  Sebastien.


> 
> 
> 
> --- linux-2.6.25.8-rt7/arch/powerpc/kernel/entry_64.S	2008-07-10 16:37:17.000000000 +0000
> +++ linux-2.6.25.8-rt7.mod/arch/powerpc/kernel/entry_64.S	2008-07-10 07:58:56.000000000 +0000
> @@ -579,14 +579,9 @@ do_work:
>  	cmpdi	r0,0
>  	crandc	eq,cr1*4+eq,eq
>  	bne	restore
> -	/* here we are preempting the current task */
>  1:
> -	li	r0,1
> -	stb	r0,PACASOFTIRQEN(r13)
> -	stb	r0,PACAHARDIRQEN(r13)
> -	ori	r10,r10,MSR_EE
> -	mtmsrd	r10,1		/* reenable interrupts */
> -	bl	.preempt_schedule
> +	/* preempt_schedule_irq() expects interrupts disabled. */
> +	bl	.preempt_schedule_irq
>  	mfmsr	r10
>  	clrrdi	r9,r1,THREAD_SHIFT
>  	rldicl	r10,r10,48,1	/* disable interrupts again */
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-07-11  8:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-10 17:04 [PATCH][RT][PPC64] Fix a previously reverted "fix" Chirag Jog
2008-07-11  8:02 ` Sebastien Dugue

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).