X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=arch%2Farm%2Fkernel%2Fentry-header.S;h=f1c2fd5b63e40beb0e990148a2cd2be5fde2c139;hb=ae574a5d7aa1d80469dfcbaa757db2bea536ee66;hp=648cfff93138bdc1df9e025efef31dbc1211a821;hpb=dbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9;p=powerpc.git

diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 648cfff931..f1c2fd5b63 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -19,6 +19,7 @@
 @
 @ Most of the stack format comes from struct pt_regs, but with
 @ the addition of 8 bytes for storing syscall args 5 and 6.
+@ This _must_ remain a multiple of 8 for EABI.
 @
 #define S_OFF		8
 
@@ -36,24 +37,6 @@
 #endif
 	.endm
 
-#if __LINUX_ARM_ARCH__ >= 6
-	.macro	disable_irq
-	cpsid	i
-	.endm
-
-	.macro	enable_irq
-	cpsie	i
-	.endm
-#else
-	.macro	disable_irq
-	msr	cpsr_c, #PSR_I_BIT | SVC_MODE
-	.endm
-
-	.macro	enable_irq
-	msr	cpsr_c, #SVC_MODE
-	.endm
-#endif
-
 	.macro	get_thread_info, rd
 	mov	\rd, sp, lsr #13
 	mov	\rd, \rd, lsl #13