summaryrefslogtreecommitdiff
path: root/lib/mpi/mpi-cmp.c
diff options
context:
space:
mode:
authorChris Zankel <chris@zankel.net>2015-04-14 03:51:35 +0000
committerChris Zankel <chris@zankel.net>2015-04-14 03:51:35 +0000
commit7ead5b7e4a3cf4a16579a8f164022345b93fe972 (patch)
tree0a9b9497f53d1593c9e2ac197b2e686ea74a9975 /lib/mpi/mpi-cmp.c
parent834a316eeebcb75316c0a7d9088fa638c52dc584 (diff)
parent39a8804455fb23f09157341d3ba7db6d7ae6ee76 (diff)
Merge tag 'v4.0' into for_next
Linux 4.0
Diffstat (limited to 'lib/mpi/mpi-cmp.c')
-rw-r--r--lib/mpi/mpi-cmp.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/mpi/mpi-cmp.c b/lib/mpi/mpi-cmp.c
index 1871e7b61ca0..d25e9e96c310 100644
--- a/lib/mpi/mpi-cmp.c
+++ b/lib/mpi/mpi-cmp.c
@@ -57,14 +57,12 @@ int mpi_cmp(MPI u, MPI v)
if (usize != vsize && !u->sign && !v->sign)
return usize - vsize;
if (usize != vsize && u->sign && v->sign)
- return vsize + usize;
+ return vsize - usize;
if (!usize)
return 0;
cmp = mpihelp_cmp(u->d, v->d, usize);
- if (!cmp)
- return 0;
- if ((cmp < 0 ? 1 : 0) == (u->sign ? 1 : 0))
- return 1;
- return -1;
+ if (u->sign)
+ return -cmp;
+ return cmp;
}
EXPORT_SYMBOL_GPL(mpi_cmp);