aboutsummaryrefslogtreecommitdiffstats
path: root/include/math-emu/op-common.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-08-01 20:05:18 -0400
committerDave Airlie <airlied@redhat.com>2010-08-01 20:05:24 -0400
commitd656ae53f64cb0f01dac8a02c4d31453d64ef97c (patch)
treecf641d4e5828b8f7c430b42657237c5daf9571fd /include/math-emu/op-common.h
parent167ffc44caaee68ea60dadf6931a4d195a4ed1f0 (diff)
parentb37fa16e78d6f9790462b3181602a26b5af36260 (diff)
Merge tag 'v2.6.35-rc6' into drm-radeon-next
Need this to avoid conflicts with future radeon fixes
Diffstat (limited to 'include/math-emu/op-common.h')
-rw-r--r--include/math-emu/op-common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/math-emu/op-common.h b/include/math-emu/op-common.h
index fd882261225e..9696a5e2c437 100644
--- a/include/math-emu/op-common.h
+++ b/include/math-emu/op-common.h
@@ -799,7 +799,7 @@ do { \
799 X##_e -= (_FP_W_TYPE_SIZE - rsize); \ 799 X##_e -= (_FP_W_TYPE_SIZE - rsize); \
800 X##_e = rsize - X##_e - 1; \ 800 X##_e = rsize - X##_e - 1; \
801 \ 801 \
802 if (_FP_FRACBITS_##fs < rsize && _FP_WFRACBITS_##fs < X##_e) \ 802 if (_FP_FRACBITS_##fs < rsize && _FP_WFRACBITS_##fs <= X##_e) \
803 __FP_FRAC_SRS_1(ur_, (X##_e - _FP_WFRACBITS_##fs + 1), rsize);\ 803 __FP_FRAC_SRS_1(ur_, (X##_e - _FP_WFRACBITS_##fs + 1), rsize);\
804 _FP_FRAC_DISASSEMBLE_##wc(X, ur_, rsize); \ 804 _FP_FRAC_DISASSEMBLE_##wc(X, ur_, rsize); \
805 if ((_FP_WFRACBITS_##fs - X##_e - 1) > 0) \ 805 if ((_FP_WFRACBITS_##fs - X##_e - 1) > 0) \