diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
| commit | 66643de455c27973ac31ad6de9f859d399916842 (patch) | |
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /arch/arm/lib/div64.S | |
| parent | 2c23d62abb820e19c54012520f08a198c2233a85 (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'arch/arm/lib/div64.S')
| -rw-r--r-- | arch/arm/lib/div64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/div64.S b/arch/arm/lib/div64.S index ec9a1cd6176..58eef660762 100644 --- a/arch/arm/lib/div64.S +++ b/arch/arm/lib/div64.S | |||
| @@ -189,12 +189,12 @@ ENTRY(__do_div64) | |||
| 189 | moveq pc, lr | 189 | moveq pc, lr |
| 190 | 190 | ||
| 191 | @ Division by 0: | 191 | @ Division by 0: |
| 192 | str lr, [sp, #-4]! | 192 | str lr, [sp, #-8]! |
| 193 | bl __div0 | 193 | bl __div0 |
| 194 | 194 | ||
| 195 | @ as wrong as it could be... | 195 | @ as wrong as it could be... |
| 196 | mov yl, #0 | 196 | mov yl, #0 |
| 197 | mov yh, #0 | 197 | mov yh, #0 |
| 198 | mov xh, #0 | 198 | mov xh, #0 |
| 199 | ldr pc, [sp], #4 | 199 | ldr pc, [sp], #8 |
| 200 | 200 | ||