diff options
| author | Russell King | 2016-01-05 12:07:28 +0100 |
|---|---|---|
| committer | Russell King | 2016-01-05 12:07:28 +0100 |
| commit | 598bcc6ea6ec4032d2ace8b1b43d11b4708af072 (patch) | |
| tree | 675a2b01617549b539a4dcb1aec7141798e1f324 /arch/arm/lib | |
| parent | ARM: 8484/1: Documentation: l2c2x0: Mention separate controllers explicitly (diff) | |
| parent | ARM: 8481/2: drivers: psci: replace psci firmware calls (diff) | |
| download | kernel-qcow2-linux-598bcc6ea6ec4032d2ace8b1b43d11b4708af072.tar.gz kernel-qcow2-linux-598bcc6ea6ec4032d2ace8b1b43d11b4708af072.tar.xz kernel-qcow2-linux-598bcc6ea6ec4032d2ace8b1b43d11b4708af072.zip | |
Merge branches 'misc' and 'misc-rc6' into for-linus
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/lib1funcs.S | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/lib/lib1funcs.S b/arch/arm/lib/lib1funcs.S index af2267f6a529..9397b2e532af 100644 --- a/arch/arm/lib/lib1funcs.S +++ b/arch/arm/lib/lib1funcs.S @@ -205,6 +205,10 @@ Boston, MA 02111-1307, USA. */ .endm +#ifdef CONFIG_ARM_PATCH_IDIV + .align 3 +#endif + ENTRY(__udivsi3) ENTRY(__aeabi_uidiv) UNWIND(.fnstart) @@ -253,6 +257,10 @@ UNWIND(.fnstart) UNWIND(.fnend) ENDPROC(__umodsi3) +#ifdef CONFIG_ARM_PATCH_IDIV + .align 3 +#endif + ENTRY(__divsi3) ENTRY(__aeabi_idiv) UNWIND(.fnstart) |