aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/math-emu/op-2.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-12-14 16:46:50 +1100
committerPaul Mackerras <paulus@samba.org>2007-12-14 16:46:50 +1100
commit280bb6b1f76aaec29a721b1025ec5d69afba57e8 (patch)
tree769284bd2000bb80e49a6d23df61e3fedc947c64 /arch/powerpc/math-emu/op-2.h
parenteb8dc843fc3c0dbac553ec79d7e5b4d8339aeb3d (diff)
parentc89686210542f6946e48a907772a356b9fce03f0 (diff)
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc/math-emu/op-2.h')
-rw-r--r--arch/powerpc/math-emu/op-2.h3
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)