git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
arm
/
kernel
/
entry-header.S
diff --git
a/arch/arm/kernel/entry-header.S
b/arch/arm/kernel/entry-header.S
index
f1c2fd5
..
55c99cd
100644
(file)
--- a/
arch/arm/kernel/entry-header.S
+++ b/
arch/arm/kernel/entry-header.S
@@
-37,6
+37,24
@@
#endif
.endm
#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
.macro get_thread_info, rd
mov \rd, sp, lsr #13
mov \rd, \rd, lsl #13