[tip:irq/urgent] sparc: Use preempt_schedule_irq

2013-11-13 Thread tip-bot for Thomas Gleixner
Commit-ID:  9385d949d5bd0eb642ed05ea263c3638c9f4e372
Gitweb: http://git.kernel.org/tip/9385d949d5bd0eb642ed05ea263c3638c9f4e372
Author: Thomas Gleixner 
AuthorDate: Tue, 17 Sep 2013 18:53:08 +
Committer:  Thomas Gleixner 
CommitDate: Wed, 13 Nov 2013 20:21:47 +0100

sparc: Use preempt_schedule_irq

The low level preemption code fiddles with the PREEMPT_ACTIVE bit for
no reason and calls schedule() with interrupts disabled, which is
wrong to begin with. Remove the PREEMPT_ACTIVE fiddling and call the
proper schedule_preempt_irq() function.

Signed-off-by: Thomas Gleixner 
Acked-by: David S. Miller 
Cc: sparcli...@vger.kernel.org
Link: http://lkml.kernel.org/r/20130917183628.966769...@linutronix.de

---
 arch/sparc/kernel/rtrap_64.S | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/sparc/kernel/rtrap_64.S b/arch/sparc/kernel/rtrap_64.S
index afa2a9e..76213db 100644
--- a/arch/sparc/kernel/rtrap_64.S
+++ b/arch/sparc/kernel/rtrap_64.S
@@ -306,12 +306,10 @@ to_kernel:
 nop
cmp %l4, 0
bne,pn  %xcc, kern_fpucheck
-sethi  %hi(PREEMPT_ACTIVE), %l6
-   stw %l6, [%g6 + TI_PRE_COUNT]
-   callschedule
+nop
+   callpreempt_schedule_irq
 nop
ba,pt   %xcc, rtrap
-stw%g0, [%g6 + TI_PRE_COUNT]
 #endif
 kern_fpucheck: ldub[%g6 + TI_FPDEPTH], %l5
brz,pt  %l5, rt_continue
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[tip:irq/urgent] sparc: Use preempt_schedule_irq

2013-11-13 Thread tip-bot for Thomas Gleixner
Commit-ID:  9385d949d5bd0eb642ed05ea263c3638c9f4e372
Gitweb: http://git.kernel.org/tip/9385d949d5bd0eb642ed05ea263c3638c9f4e372
Author: Thomas Gleixner t...@linutronix.de
AuthorDate: Tue, 17 Sep 2013 18:53:08 +
Committer:  Thomas Gleixner t...@linutronix.de
CommitDate: Wed, 13 Nov 2013 20:21:47 +0100

sparc: Use preempt_schedule_irq

The low level preemption code fiddles with the PREEMPT_ACTIVE bit for
no reason and calls schedule() with interrupts disabled, which is
wrong to begin with. Remove the PREEMPT_ACTIVE fiddling and call the
proper schedule_preempt_irq() function.

Signed-off-by: Thomas Gleixner t...@linutronix.de
Acked-by: David S. Miller da...@davemloft.net
Cc: sparcli...@vger.kernel.org
Link: http://lkml.kernel.org/r/20130917183628.966769...@linutronix.de

---
 arch/sparc/kernel/rtrap_64.S | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/sparc/kernel/rtrap_64.S b/arch/sparc/kernel/rtrap_64.S
index afa2a9e..76213db 100644
--- a/arch/sparc/kernel/rtrap_64.S
+++ b/arch/sparc/kernel/rtrap_64.S
@@ -306,12 +306,10 @@ to_kernel:
 nop
cmp %l4, 0
bne,pn  %xcc, kern_fpucheck
-sethi  %hi(PREEMPT_ACTIVE), %l6
-   stw %l6, [%g6 + TI_PRE_COUNT]
-   callschedule
+nop
+   callpreempt_schedule_irq
 nop
ba,pt   %xcc, rtrap
-stw%g0, [%g6 + TI_PRE_COUNT]
 #endif
 kern_fpucheck: ldub[%g6 + TI_FPDEPTH], %l5
brz,pt  %l5, rt_continue
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/