From: Geert Uytterhoeven Date: Sat, 7 May 2011 18:56:00 +0000 (+0200) Subject: m68k/amiga: Chip RAM - Use lookup_resource() X-Git-Tag: MMI-PSA29.97-13-9~18714^2~6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b7785e954348465e1926d9c10ff3e49c207d4ec6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git m68k/amiga: Chip RAM - Use lookup_resource() Replace a custom implementation (which doesn't lock the resource tree) by a call to lookup_resource() Signed-off-by: Geert Uytterhoeven --- diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c index 4790f77cbd48..99449fbf9a72 100644 --- a/arch/m68k/amiga/chipram.c +++ b/arch/m68k/amiga/chipram.c @@ -93,21 +93,21 @@ void *amiga_chip_alloc_res(unsigned long size, struct resource *res) void amiga_chip_free(void *ptr) { unsigned long start = ZTWO_PADDR(ptr); - struct resource **p, *res; + struct resource *res; unsigned long size; - for (p = &chipram_res.child; (res = *p); p = &res->sibling) { - if (res->start != start) - continue; - *p = res->sibling; - size = resource_size(res); - pr_debug("amiga_chip_free: free %lu bytes at %p\n", size, ptr); - atomic_add(size, &chipavail); - kfree(res); + res = lookup_resource(&chipram_res, start); + if (!res) { + pr_err("amiga_chip_free: trying to free nonexistent region at " + "%p\n", ptr); return; } - pr_err("amiga_chip_free: trying to free nonexistent region at %p\n", - ptr); + + size = resource_size(res); + pr_debug("amiga_chip_free: free %lu bytes at %p\n", size, ptr); + atomic_add(size, &chipavail); + release_resource(res); + kfree(res); } EXPORT_SYMBOL(amiga_chip_free);