diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-31 02:37:44 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-31 02:37:44 +0100 |
commit | 9e0cb06b17be7e562cbdaba2768649f025826dc6 (patch) | |
tree | aaf5ef8c6cd11764d222df9c446ad9af17e0020e /arch/ppc64/mm/imalloc.c | |
parent | [PATCH] fec_8xx: Add support for Intel PHY LX971 (diff) | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
download | linux-9e0cb06b17be7e562cbdaba2768649f025826dc6.tar.xz linux-9e0cb06b17be7e562cbdaba2768649f025826dc6.zip |
Merge branch 'master'
Diffstat (limited to 'arch/ppc64/mm/imalloc.c')
-rw-r--r-- | arch/ppc64/mm/imalloc.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/ppc64/mm/imalloc.c b/arch/ppc64/mm/imalloc.c index c65b87b92756..f4ca29cf5364 100644 --- a/arch/ppc64/mm/imalloc.c +++ b/arch/ppc64/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; |