powerpc: apply recent changes to merged code

Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 0 insertions, 5 deletions

diff --git a/arch/powerpc/mm/imalloc.c b/arch/powerpc/mm/imalloc.c
index c65b87b92756..f4ca29cf5364 100644
--- a/arch/powerpc/mm/imalloc.c
+++ b/arch/powerpc/mm/imalloc.c
@@ -300,12 +300,7 @@ void im_free(void * addr)
         for (p = &imlist ; (tmp = *p) ; p = &tmp->next) {
                 if (tmp->addr == addr) {
                         *p = tmp->next;
-
-                        /* XXX: do we need the lock? */
-                        spin_lock(&init_mm.page_table_lock);
                         unmap_vm_area(tmp);
-                        spin_unlock(&init_mm.page_table_lock);
-
                         kfree(tmp);
                         up(&imlist_sem);
                         return;