Title: [5884] trunk/arch/blackfin: cleanup ipipe asm code a bit and add missing ENDPROC()
- Revision
- 5884
- Author
- vapier
- Date
- 2008-12-18 11:54:09 -0600 (Thu, 18 Dec 2008)
Log Message
cleanup ipipe asm code a bit and add missing ENDPROC()
Modified Paths
Diff
Modified: trunk/arch/blackfin/kernel/mcount.S (5883 => 5884)
--- trunk/arch/blackfin/kernel/mcount.S 2008-12-18 17:50:15 UTC (rev 5883)
+++ trunk/arch/blackfin/kernel/mcount.S 2008-12-18 17:54:09 UTC (rev 5884)
@@ -36,7 +36,7 @@
p1.L = _ipipe_trace_enable;
p1.H = _ipipe_trace_enable;
r7 = [p1];
- CC = r7==0;
+ CC = r7 == 0;
if CC jump out;
link 0x10;
r0 = 0x0;
@@ -67,3 +67,4 @@
i1 = [sp++];
i0 = [sp++];
rts;
+ENDPROC(__mcount)
Modified: trunk/arch/blackfin/mach-common/interrupt.S (5883 => 5884)
--- trunk/arch/blackfin/mach-common/interrupt.S 2008-12-18 17:50:15 UTC (rev 5883)
+++ trunk/arch/blackfin/mach-common/interrupt.S 2008-12-18 17:54:09 UTC (rev 5884)
@@ -254,22 +254,21 @@
call _system_call;
jump .Lcommon_restore_context;
ENDPROC(_evt_system_call)
-#ifdef CONFIG_IPIPE
+#ifdef CONFIG_IPIPE
ENTRY(___ipipe_call_irqtail)
-
r0.l = 1f;
r0.h = 1f;
reti = r0;
- rti
+ rti;
1:
[--sp] = rets;
[--sp] = ( r7:4, p5:3 );
p0.l = ___ipipe_irq_tail_hook;
p0.h = ___ipipe_irq_tail_hook;
- p0 = [p0] ;
- sp += -12 ;
- call (p0) ;
+ p0 = [p0];
+ sp += -12;
+ call (p0);
sp += 12;
( r7:4, p5:3 ) = [sp++];
rets = [sp++];
@@ -287,7 +286,7 @@
raise 14;
[--sp] = reti; /* IRQs on. */
2:
- jump 2b /* Likely paranoid. */
+ jump 2b; /* Likely paranoid. */
3:
sp += 4; /* Discard saved RETI */
r0.h = _evt14_softirq;
@@ -295,16 +294,16 @@
p0.l = lo(EVT14);
p0.h = hi(EVT14);
[p0] = r0;
- csync
+ csync;
p0.l = _bfin_irq_flags;
p0.h = _bfin_irq_flags;
r0 = [p0];
- sti r0
+ sti r0;
#if 0 /* FIXME: this actually raises scheduling latencies */
- /* Reenable interrupts */
- [--sp] = reti;
- r0 = [sp++];
+ /* Reenable interrupts */
+ [--sp] = reti;
+ r0 = [sp++];
#endif
rts;
-
+ENDPROC(___ipipe_call_irqtail)
#endif /* CONFIG_IPIPE */
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
