From cab49bc95d848a85d7108f896f6d21283f25f54c Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Sun, 24 Apr 2011 23:40:51 +0200 Subject: [PATCH] m68k/amiga: Chip RAM - Change chipavail to an atomic_t While the core resource handling code is safe, our global counter must still be protected against concurrent modifications. Signed-off-by: Geert Uytterhoeven --- arch/m68k/amiga/chipram.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c index e5a8dbc9abaf..c3fe45125f52 100644 --- a/arch/m68k/amiga/chipram.c +++ b/arch/m68k/amiga/chipram.c @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -25,7 +26,7 @@ EXPORT_SYMBOL(amiga_chip_size); static struct resource chipram_res = { .name = "Chip RAM", .start = CHIP_PHYSADDR }; -static unsigned long chipavail; +static atomic_t chipavail; void __init amiga_chip_init(void) @@ -36,7 +37,7 @@ void __init amiga_chip_init(void) chipram_res.end = amiga_chip_size-1; request_resource(&iomem_resource, &chipram_res); - chipavail = amiga_chip_size; + atomic_set(&chipavail, amiga_chip_size); } @@ -84,7 +85,7 @@ void *amiga_chip_alloc_res(unsigned long size, struct resource *res) return NULL; } - chipavail -= size; + atomic_sub(size, &chipavail); pr_debug("amiga_chip_alloc_res: returning %pR\n", res); return (void *)ZTWO_VADDR(res->start); } @@ -101,7 +102,7 @@ void amiga_chip_free(void *ptr) *p = res->sibling; size = res->end-start; pr_debug("amiga_chip_free: free %lu bytes at %p\n", size, ptr); - chipavail += size; + atomic_add(size, &chipavail); kfree(res); return; } @@ -113,8 +114,10 @@ EXPORT_SYMBOL(amiga_chip_free); unsigned long amiga_chip_avail(void) { - pr_debug("amiga_chip_avail : %lu bytes\n", chipavail); - return chipavail; + unsigned long n = atomic_read(&chipavail); + + pr_debug("amiga_chip_avail : %lu bytes\n", n); + return n; } EXPORT_SYMBOL(amiga_chip_avail); -- 2.30.2