diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /arch/s390 | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'arch/s390')
| -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) { | |||
| 2088 | __u16 opc = *((__u16 *) opcode); | 2088 | __u16 opc = *((__u16 *) opcode); |
| 2089 | 2089 | ||
| 2090 | if ((opc & 0x90) == 0) { /* test if rx in {0,2,4,6} */ | 2090 | if ((opc & 0x90) == 0) { /* test if rx in {0,2,4,6} */ |
| 2091 | /* we got an exception therfore ry can't be in {0,2,4,6} */ | 2091 | /* we got an exception therefore ry can't be in {0,2,4,6} */ |
| 2092 | asm volatile( /* load rx from fp_regs.fprs[ry] */ | 2092 | asm volatile( /* load rx from fp_regs.fprs[ry] */ |
| 2093 | " bras 1,0f\n" | 2093 | " bras 1,0f\n" |
| 2094 | " ld 0,0(%1)\n" | 2094 | " ld 0,0(%1)\n" |
| @@ -2118,7 +2118,7 @@ int math_emu_ler(__u8 *opcode) { | |||
| 2118 | __u16 opc = *((__u16 *) opcode); | 2118 | __u16 opc = *((__u16 *) opcode); |
| 2119 | 2119 | ||
| 2120 | if ((opc & 0x90) == 0) { /* test if rx in {0,2,4,6} */ | 2120 | if ((opc & 0x90) == 0) { /* test if rx in {0,2,4,6} */ |
| 2121 | /* we got an exception therfore ry can't be in {0,2,4,6} */ | 2121 | /* we got an exception therefore ry can't be in {0,2,4,6} */ |
| 2122 | asm volatile( /* load rx from fp_regs.fprs[ry] */ | 2122 | asm volatile( /* load rx from fp_regs.fprs[ry] */ |
| 2123 | " bras 1,0f\n" | 2123 | " bras 1,0f\n" |
| 2124 | " le 0,0(%1)\n" | 2124 | " le 0,0(%1)\n" |