diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 17:22:29 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 17:22:29 +0900 |
commit | b79b3e05b1229d5b2fc2af71dc29701642577eba (patch) | |
tree | bcdf728ccfab02d66e129cacaa106bf8cc60f2d6 /arch/arm/kernel/head.S | |
parent | ARM: static should be at beginning of declaration (diff) | |
parent | ARM: mach-shmobile: ag5evm: SDHI requires waiting for idle (diff) | |
download | linux-dev-b79b3e05b1229d5b2fc2af71dc29701642577eba.tar.xz linux-dev-b79b3e05b1229d5b2fc2af71dc29701642577eba.zip |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'arch/arm/kernel/head.S')
-rw-r--r-- | arch/arm/kernel/head.S | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 278c1b0ebb2e..742b6108a001 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -71,8 +71,16 @@ * crap here - that's what the boot loader (or in extreme, well justified * circumstances, zImage) is for. */ + .arm + __HEAD ENTRY(stext) + + THUMB( adr r9, BSYM(1f) ) @ Kernel is always entered in ARM. + THUMB( bx r9 ) @ If this is a Thumb-2 kernel, + THUMB( .thumb ) @ switch to Thumb now. + THUMB(1: ) + setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9 @ ensure svc mode @ and irqs disabled mrc p15, 0, r9, c0, c0 @ get processor id |