aboutsummaryrefslogtreecommitdiff
path: root/lib/mpi/mpi-bit.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-04-26 20:00:35 -0700
committerDavid S. Miller <davem@davemloft.net>2012-04-26 20:00:35 -0700
commit8fe5f56c8a203a7a83d1b621c369655d914f3752 (patch)
treeec865efb2d577d1e536720a28ae18b10bdbfd973 /lib/mpi/mpi-bit.c
parentdf2e7f525d88da992021b589d8a412afc15de36c (diff)
parent82b769063598d01a8b24abf250a53f8b437e09f1 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Conflicts: arch/sparc/kernel/leon_smp.c Merge mainline to get the nobootmem.c bug fix, for the sake of the sparc64 NO_BOOTMEM conversion. Resolve a small include line conflict in leon_smp.c Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/mpi/mpi-bit.c')
-rw-r--r--lib/mpi/mpi-bit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/mpi/mpi-bit.c b/lib/mpi/mpi-bit.c
index 2f526627e4f5..0c505361da19 100644
--- a/lib/mpi/mpi-bit.c
+++ b/lib/mpi/mpi-bit.c
@@ -177,8 +177,8 @@ int mpi_rshift(MPI x, MPI a, unsigned n)
*/
int mpi_lshift_limbs(MPI a, unsigned int count)
{
- mpi_ptr_t ap = a->d;
- int n = a->nlimbs;
+ const int n = a->nlimbs;
+ mpi_ptr_t ap;
int i;
if (!count || !n)
@@ -187,6 +187,7 @@ int mpi_lshift_limbs(MPI a, unsigned int count)
if (RESIZE_IF_NEEDED(a, n + count) < 0)
return -ENOMEM;
+ ap = a->d;
for (i = n - 1; i >= 0; i--)
ap[i + count] = ap[i];
for (i = 0; i < count; i++)