Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci

As Stephen Rothwell reports, a849088aa155 ("ARM: Fix ioremap() of
address zero") from the arm-current tree and commit c2794437091a ("ARM:
Add fixed PCI i/o mapping") from the arm-soc tree conflict in
a nontrivial way in arch/arm/mm/mmu.c.

Rob Herring explains:
The PCI i/o reserved area has a dummy physical address of 0 and
needs to be skipped by ioremap searches. So we don't set
VM_ARM_STATIC_MAPPING to prevent matches by ioremap. The vm_struct
settings don't really matter when we do the real mapping of the
i/o space.

Since commit a849088aa155 is at the start of the fixes branch
in the arm tree, we can merge it into the branch that contains
the other ioremap changes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 0 insertions, 88 deletions

diff --git a/lib/mpi/mpiutil.c b/lib/mpi/mpiutil.c
index 26e4ed31e256..657979f71bef 100644
--- a/lib/mpi/mpiutil.c
+++ b/lib/mpi/mpiutil.c
@@ -106,13 +106,6 @@ int mpi_resize(MPI a, unsigned nlimbs)
         return 0;
 }
 
-void mpi_clear(MPI a)
-{
-        a->nlimbs = 0;
-        a->nbits = 0;
-        a->flags = 0;
-}
-
 void mpi_free(MPI a)
 {
         if (!a)
@@ -128,84 +121,3 @@ void mpi_free(MPI a)
         kfree(a);
 }
 EXPORT_SYMBOL_GPL(mpi_free);
-
-/****************
- * Note: This copy function should not interpret the MPI
- *       but copy it transparently.
- */
-int mpi_copy(MPI *copied, const MPI a)
-{
-        size_t i;
-        MPI b;
-
-        *copied = NULL;
-
-        if (a) {
-                b = mpi_alloc(a->nlimbs);
-                if (!b)
-                        return -ENOMEM;
-
-                b->nlimbs = a->nlimbs;
-                b->sign = a->sign;
-                b->flags = a->flags;
-                b->nbits = a->nbits;
-
-                for (i = 0; i < b->nlimbs; i++)
-                        b->d[i] = a->d[i];
-
-                *copied = b;
-        }
-
-        return 0;
-}
-
-int mpi_set(MPI w, const MPI u)
-{
-        mpi_ptr_t wp, up;
-        mpi_size_t usize = u->nlimbs;
-        int usign = u->sign;
-
-        if (RESIZE_IF_NEEDED(w, (size_t) usize) < 0)
-                return -ENOMEM;
-
-        wp = w->d;
-        up = u->d;
-        MPN_COPY(wp, up, usize);
-        w->nlimbs = usize;
-        w->nbits = u->nbits;
-        w->flags = u->flags;
-        w->sign = usign;
-        return 0;
-}
-
-int mpi_set_ui(MPI w, unsigned long u)
-{
-        if (RESIZE_IF_NEEDED(w, 1) < 0)
-                return -ENOMEM;
-        w->d[0] = u;
-        w->nlimbs = u ? 1 : 0;
-        w->sign = 0;
-        w->nbits = 0;
-        w->flags = 0;
-        return 0;
-}
-
-MPI mpi_alloc_set_ui(unsigned long u)
-{
-        MPI w = mpi_alloc(1);
-        if (!w)
-                return w;
-        w->d[0] = u;
-        w->nlimbs = u ? 1 : 0;
-        w->sign = 0;
-        return w;
-}
-
-void mpi_swap(MPI a, MPI b)
-{
-        struct gcry_mpi tmp;
-
-        tmp = *a;
-        *a = *b;
-        *b = tmp;
-}