git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull kmalloc into release branch
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
entry-header.S
diff --git
a/arch/arm/kernel/entry-header.S
b/arch/arm/kernel/entry-header.S
index
648cfff
..
87ab4e1
100644
(file)
--- a/
arch/arm/kernel/entry-header.S
+++ b/
arch/arm/kernel/entry-header.S
@@
-1,4
+1,3
@@
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/linkage.h>
#include <linux/init.h>
#include <linux/linkage.h>
@@
-19,6
+18,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.
@
@ 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
@
#define S_OFF 8
@@
-36,24
+36,6
@@
#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