diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2009-03-10 10:24:54 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2009-03-10 10:24:54 +0000 |
| commit | 77582cfa8a38fc71d1c46b3296a9f7ba4ad80275 (patch) | |
| tree | 5d1e747b8d65aa5198d2203623800632e17685e9 /arch/arm/mach-integrator | |
| parent | 1745b660c1511279f83ec45e6404d484ba98e578 (diff) | |
Thumb-2: Add IT instructions to the kernel assembly code
With modified GNU assembler, these instructions are automatically
generated. This patch is to be used if such gas isn't available.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm/mach-integrator')
| -rw-r--r-- | arch/arm/mach-integrator/include/mach/debug-macro.S | 1 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/include/mach/entry-macro.S | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-integrator/include/mach/debug-macro.S b/arch/arm/mach-integrator/include/mach/debug-macro.S index d347d659ea30..ffb7d8961f5e 100644 --- a/arch/arm/mach-integrator/include/mach/debug-macro.S +++ b/arch/arm/mach-integrator/include/mach/debug-macro.S @@ -14,6 +14,7 @@ .macro addruart,rx mrc p15, 0, \rx, c1, c0 tst \rx, #1 @ MMU enabled? + itee eq moveq \rx, #0x16000000 @ physical base address movne \rx, #0xf0000000 @ virtual base addne \rx, \rx, #0x16000000 >> 4 diff --git a/arch/arm/mach-integrator/include/mach/entry-macro.S b/arch/arm/mach-integrator/include/mach/entry-macro.S index 7649c57acb53..ce478b5bfb90 100644 --- a/arch/arm/mach-integrator/include/mach/entry-macro.S +++ b/arch/arm/mach-integrator/include/mach/entry-macro.S @@ -26,6 +26,7 @@ ldr \irqstat, [\base, #IRQ_STATUS] @ get masked status ldr \base, =IO_ADDRESS(INTEGRATOR_HDR_BASE) teq \irqstat, #0 + itt eq ldreq \irqstat, [\base, #(INTEGRATOR_HDR_IC_OFFSET+IRQ_STATUS)] moveq \irqnr, #IRQ_CIC_START |