[patches.git] / blackfin-dont-save-restore-retx-retn-rete.patch

Index: include/asm-blackfin/mach-common/context.S
===================================================================
--- include/asm-blackfin/mach-common/context.S	(revision 3496)
+++ include/asm-blackfin/mach-common/context.S	(working copy)
@@ -79,9 +79,6 @@
 	[--sp] = RETS;
 	r0 = RETI;
 	[--sp] = r0;
-	[--sp] = RETX;
-	[--sp] = RETN;
-	[--sp] = RETE;
 	[--sp] = SEQSTAT;
 	[--sp] = r0;	/* Skip IPEND as well. */
 	/* Switch to other method of keeping interrupts disabled.  */
@@ -146,9 +143,6 @@
 	[--sp] = RETS;
 	r0 = RETI;
 	[--sp] = r0;
-	[--sp] = RETX;
-	[--sp] = RETN;
-	[--sp] = RETE;
 	[--sp] = SEQSTAT;
 	[--sp] = r0;	/* Skip IPEND as well. */
 	[--sp] = RETI;  /*orig_pc*/
@@ -214,9 +208,6 @@
 	[--sp] = RETS;
 	r0 = RETI;
 	[--sp] = r0;
-	[--sp] = RETX;
-	[--sp] = RETN;
-	[--sp] = RETE;
 	[--sp] = SEQSTAT;
 #ifdef CONFIG_KGDB
 	r1.l = lo(IPEND);
@@ -238,9 +229,6 @@
 	sp += 4;	/* Skip orig_pc */
 	sp += 4;	/* Skip IPEND */
 	SEQSTAT = [sp++];
-	RETE = [sp++];
-	RETN = [sp++];
-	RETX = [sp++];
 	r0 = [sp++];
 	RETI = r0;	/* Restore RETI indirectly when in exception */
 	RETS = [sp++];
@@ -292,9 +280,6 @@
 	sp += 4;	/* Skip orig_pc */
 	sp += 4;	/* Skip IPEND */
 	SEQSTAT = [sp++];
-	RETE = [sp++];
-	RETN = [sp++];
-	RETX = [sp++];
 	RETI = [sp++];
 	RETS = [sp++];
 
Index: arch/blackfin/mach-common/interrupt.S
===================================================================
--- arch/blackfin/mach-common/interrupt.S	(revision 3499)
+++ arch/blackfin/mach-common/interrupt.S	(working copy)
@@ -92,9 +92,6 @@ __common_int_entry:
 	[--sp] = RETS;
 	r2 = RETI;
 	[--sp] = r2;
-	[--sp] = RETX;
-	[--sp] = RETN;
-	[--sp] = RETE;
 	[--sp] = SEQSTAT;
 	[--sp] = r1;	/* IPEND - R1 may or may not be set up before jumping here. */
Commit	Line	Data
5e993f12	1	Index: include/asm-blackfin/mach-common/context.S
	2	===================================================================
	3	--- include/asm-blackfin/mach-common/context.S (revision 3496)
	4	+++ include/asm-blackfin/mach-common/context.S (working copy)
	5	@@ -79,9 +79,6 @@
	6	[--sp] = RETS;
	7	r0 = RETI;
	8	[--sp] = r0;
	9	- [--sp] = RETX;
	10	- [--sp] = RETN;
	11	- [--sp] = RETE;
	12	[--sp] = SEQSTAT;
	13	[--sp] = r0; /* Skip IPEND as well. */
	14	/* Switch to other method of keeping interrupts disabled. */
	15	@@ -146,9 +143,6 @@
	16	[--sp] = RETS;
	17	r0 = RETI;
	18	[--sp] = r0;
	19	- [--sp] = RETX;
	20	- [--sp] = RETN;
	21	- [--sp] = RETE;
	22	[--sp] = SEQSTAT;
	23	[--sp] = r0; /* Skip IPEND as well. */
	24	[--sp] = RETI; /orig_pc/
	25	@@ -214,9 +208,6 @@
	26	[--sp] = RETS;
	27	r0 = RETI;
	28	[--sp] = r0;
	29	- [--sp] = RETX;
	30	- [--sp] = RETN;
	31	- [--sp] = RETE;
	32	[--sp] = SEQSTAT;
	33	#ifdef CONFIG_KGDB
	34	r1.l = lo(IPEND);
	35	@@ -238,9 +229,6 @@
	36	sp += 4; /* Skip orig_pc */
	37	sp += 4; /* Skip IPEND */
	38	SEQSTAT = [sp++];
	39	- RETE = [sp++];
	40	- RETN = [sp++];
	41	- RETX = [sp++];
	42	r0 = [sp++];
	43	RETI = r0; /* Restore RETI indirectly when in exception */
	44	RETS = [sp++];
	45	@@ -292,9 +280,6 @@
	46	sp += 4; /* Skip orig_pc */
	47	sp += 4; /* Skip IPEND */
	48	SEQSTAT = [sp++];
	49	- RETE = [sp++];
	50	- RETN = [sp++];
	51	- RETX = [sp++];
	52	RETI = [sp++];
	53	RETS = [sp++];
	54
	55	Index: arch/blackfin/mach-common/interrupt.S
	56	===================================================================
	57	--- arch/blackfin/mach-common/interrupt.S (revision 3499)
	58	+++ arch/blackfin/mach-common/interrupt.S (working copy)
	59	@@ -92,9 +92,6 @@ __common_int_entry:
	60	[--sp] = RETS;
	61	r2 = RETI;
	62	[--sp] = r2;
	63	- [--sp] = RETX;
	64	- [--sp] = RETN;
65	- [--sp] = RETE;
66	[--sp] = SEQSTAT;
67	[--sp] = r1; /* IPEND - R1 may or may not be set up before jumping here. */
68