diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2013-12-09 14:04:37 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-12-09 14:04:37 +0100 |
| commit | bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661 (patch) | |
| tree | da6e170ce87891a0242de88d8d7c1ba34faf9bb7 /arch/arm/lib/delay-loop.S | |
| parent | Merge branch 'mark-irqs' into devel (diff) | |
| parent | Linux 3.13-rc3 (diff) | |
| download | linux-dev-bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661.tar.xz linux-dev-bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661.zip | |
Merge tag 'v3.13-rc3' into devel
Linux 3.13-rc3
Diffstat (limited to 'arch/arm/lib/delay-loop.S')
| -rw-r--r-- | arch/arm/lib/delay-loop.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/lib/delay-loop.S b/arch/arm/lib/delay-loop.S index 36b668d8e121..bc1033b897b4 100644 --- a/arch/arm/lib/delay-loop.S +++ b/arch/arm/lib/delay-loop.S @@ -40,6 +40,7 @@ ENTRY(__loop_const_udelay) @ 0 <= r0 <= 0x7fffff06 /* * loops = r0 * HZ * loops_per_jiffy / 1000000 */ + .align 3 @ Delay routine ENTRY(__loop_delay) |