diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/parisc/math-emu/sfadd.c | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/parisc/math-emu/sfadd.c')
-rw-r--r-- | arch/parisc/math-emu/sfadd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/math-emu/sfadd.c b/arch/parisc/math-emu/sfadd.c index 008d721b5d22..f802cd6c7869 100644 --- a/arch/parisc/math-emu/sfadd.c +++ b/arch/parisc/math-emu/sfadd.c | |||
@@ -298,7 +298,7 @@ sgl_fadd( | |||
298 | if(Sgl_iszero_hidden(result)) | 298 | if(Sgl_iszero_hidden(result)) |
299 | { | 299 | { |
300 | /* Handle normalization */ | 300 | /* Handle normalization */ |
301 | /* A straight foward algorithm would now shift the result | 301 | /* A straightforward algorithm would now shift the result |
302 | * and extension left until the hidden bit becomes one. Not | 302 | * and extension left until the hidden bit becomes one. Not |
303 | * all of the extension bits need participate in the shift. | 303 | * all of the extension bits need participate in the shift. |
304 | * Only the two most significant bits (round and guard) are | 304 | * Only the two most significant bits (round and guard) are |