diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-15 08:49:32 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-15 08:49:32 -0800 |
| commit | 7547a3e8a43d31aaf91c2daf5f597e43212ccddf (patch) | |
| tree | add99b58ac3b490f6ede666b9dbf2333d87e24fa /arch/s390/math-emu/math.c | |
| parent | 0f5e182dff576e6f3cd9b805834f18d11f2882aa (diff) | |
| parent | 3ea6b3d0e6d0ffd91c0f8cadeb69b7133c038b32 (diff) | |
Merge commit 'linus' into next
Diffstat (limited to 'arch/s390/math-emu/math.c')
| -rw-r--r-- | arch/s390/math-emu/math.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/math-emu/math.c b/arch/s390/math-emu/math.c index 3ee78ccb617d..cd4e9c168dd7 100644 --- a/arch/s390/math-emu/math.c +++ b/arch/s390/math-emu/math.c @@ -2088,7 +2088,7 @@ int math_emu_ldr(__u8 *opcode) { __u16 opc = *((__u16 *) opcode); if ((opc & 0x90) == 0) { /* test if rx in {0,2,4,6} */ - /* we got an exception therfore ry can't be in {0,2,4,6} */ + /* we got an exception therefore ry can't be in {0,2,4,6} */ asm volatile( /* load rx from fp_regs.fprs[ry] */ " bras 1,0f\n" " ld 0,0(%1)\n" @@ -2118,7 +2118,7 @@ int math_emu_ler(__u8 *opcode) { __u16 opc = *((__u16 *) opcode); if ((opc & 0x90) == 0) { /* test if rx in {0,2,4,6} */ - /* we got an exception therfore ry can't be in {0,2,4,6} */ + /* we got an exception therefore ry can't be in {0,2,4,6} */ asm volatile( /* load rx from fp_regs.fprs[ry] */ " bras 1,0f\n" " le 0,0(%1)\n" |