Title: [6831] trunk/arch/blackfin/mach-common/entry.S: Blackfin: sanitize manual control of IPEND[4]
- Revision
- 6831
- Author
- vapier
- Date
- 2009-06-22 13:21:25 -0500 (Mon, 22 Jun 2009)
Log Message
Blackfin: sanitize manual control of IPEND[4]
Modified Paths
Diff
Modified: trunk/arch/blackfin/mach-common/entry.S (6830 => 6831)
--- trunk/arch/blackfin/mach-common/entry.S 2009-06-22 18:21:04 UTC (rev 6830)
+++ trunk/arch/blackfin/mach-common/entry.S 2009-06-22 18:21:25 UTC (rev 6831)
@@ -708,8 +708,14 @@
#ifdef CONFIG_IPIPE
cc = BITTST(r7, TIF_IRQ_SYNC);
if !cc jump .Lsyscall_no_irqsync;
+ /*
+ * Clear IPEND[4] manually to undo what resume_userspace_1 just did;
+ * we need this so that high priority domain interrupts may still
+ * preempt the current domain while the pipeline log is being played
+ * back.
+ */
[--sp] = reti;
- r0 = [sp++];
+ SP += 4; /* don't merge with next insn to keep the pattern obvious */
SP += -12;
call ___ipipe_sync_root;
SP += 12;
@@ -721,7 +727,7 @@
/* Reenable interrupts. */
[--sp] = reti;
- r0 = [sp++];
+ sp += 4;
SP += -12;
call _schedule;
@@ -737,7 +743,7 @@
.Lsyscall_do_signals:
/* Reenable interrupts. */
[--sp] = reti;
- r0 = [sp++];
+ sp += 4;
r0 = sp;
SP += -12;
@@ -747,10 +753,6 @@
.Lsyscall_really_exit:
r5 = [sp + PT_RESERVED];
rets = r5;
-#ifdef CONFIG_IPIPE
- [--sp] = reti;
- r5 = [sp++];
-#endif /* CONFIG_IPIPE */
rts;
ENDPROC(_system_call)
@@ -904,14 +906,9 @@
#ifdef CONFIG_IPIPE
-_sync_root_irqs:
- [--sp] = reti; /* Reenable interrupts */
- r0 = [sp++];
- jump.l ___ipipe_sync_root
-
_resume_kernel_from_int:
- r0.l = _sync_root_irqs
- r0.h = _sync_root_irqs
+ r0.l = ___ipipe_sync_root;
+ r0.h = ___ipipe_sync_root;
[--sp] = rets;
[--sp] = ( r7:4, p5:3 );
SP += -12;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
