Merge tag 'keys-next-fixes-20150114' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
This commit is contained in:
commit
bb31f607a0
2 changed files with 5 additions and 7 deletions
|
@ -57,14 +57,12 @@ int mpi_cmp(MPI u, MPI v)
|
||||||
if (usize != vsize && !u->sign && !v->sign)
|
if (usize != vsize && !u->sign && !v->sign)
|
||||||
return usize - vsize;
|
return usize - vsize;
|
||||||
if (usize != vsize && u->sign && v->sign)
|
if (usize != vsize && u->sign && v->sign)
|
||||||
return vsize + usize;
|
return vsize - usize;
|
||||||
if (!usize)
|
if (!usize)
|
||||||
return 0;
|
return 0;
|
||||||
cmp = mpihelp_cmp(u->d, v->d, usize);
|
cmp = mpihelp_cmp(u->d, v->d, usize);
|
||||||
if (!cmp)
|
if (u->sign)
|
||||||
return 0;
|
return -cmp;
|
||||||
if ((cmp < 0 ? 1 : 0) == (u->sign ? 1 : 0))
|
return cmp;
|
||||||
return 1;
|
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(mpi_cmp);
|
EXPORT_SYMBOL_GPL(mpi_cmp);
|
||||||
|
|
|
@ -84,7 +84,7 @@ static inline int RESIZE_IF_NEEDED(MPI a, unsigned b)
|
||||||
do { \
|
do { \
|
||||||
mpi_size_t _i; \
|
mpi_size_t _i; \
|
||||||
for (_i = 0; _i < (n); _i++) \
|
for (_i = 0; _i < (n); _i++) \
|
||||||
(d)[_i] = (d)[_i]; \
|
(d)[_i] = (s)[_i]; \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
#define MPN_COPY_DECR(d, s, n) \
|
#define MPN_COPY_DECR(d, s, n) \
|
||||||
|
|
Loading…
Add table
Reference in a new issue