summaryrefslogtreecommitdiff
path: root/arch/powerpc/mm
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-31 13:57:01 +1100
committerPaul Mackerras <paulus@samba.org>2005-10-31 13:57:01 +1100
commit734d6524800b6a8362666e893a5f3f29b9ef0be9 (patch)
tree507fe9acc6fccce31369842d89d86d8dd432dc37 /arch/powerpc/mm
parent23fd07750a789a66fe88cf173d52a18f1a387da4 (diff)
powerpc: apply recent changes to merged code
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r--arch/powerpc/mm/imalloc.c5
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;