diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 08:41:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 08:41:56 -0800 |
| commit | cbd84ec0d5cf4ff760caa4b6de2925a21e21437d (patch) | |
| tree | b05681fd753bef3c3beb5c6aa3e83b9701d5f837 /arch/powerpc/math-emu/op-2.h | |
| parent | 7b286af3921e13da4838cdb451639b959c187c82 (diff) | |
| parent | 280bb6b1f76aaec29a721b1025ec5d69afba57e8 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Make PS3_SYS_MANAGER default y, not m
[POWERPC] Fix rounding bug in emulation for double float operating
[POWERPC] iSeries: don't printk with HV spinlock held
[POWERPC] 82xx: mpc8272ads, pq2fads: Update defconfig with CONFIG_FS_ENET_MDIO_FCC
[POWRPC] CPM2: Eliminate section mismatch warning in cpm2_reset().
[POWERPC] Kill non-existent symbols from ksyms and commproc.h
[POWERPC] Fix typo #ifdef -> #ifndef
Diffstat (limited to 'arch/powerpc/math-emu/op-2.h')
| -rw-r--r-- | arch/powerpc/math-emu/op-2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/math-emu/op-2.h b/arch/powerpc/math-emu/op-2.h index b9b06b4c6ea..7d6f17cc292 100644 --- a/arch/powerpc/math-emu/op-2.h +++ b/arch/powerpc/math-emu/op-2.h @@ -59,7 +59,8 @@ else \ { \ X##_f0 = (X##_f1 >> ((N) - _FP_W_TYPE_SIZE) | \ - (((X##_f1 << (sz - (N))) | X##_f0) != 0)); \ + (((X##_f1 << (2 * _FP_W_TYPE_SIZE - (N))) | \ + X##_f0) != 0)); \ X##_f1 = 0; \ } \ } while (0) |