| From ff272680e8412d6ba7d34abebce3a25f02f56a7d Mon Sep 17 00:00:00 2001 |
| From: Corey Minyard <cminyard@mvista.com> |
| Date: Fri, 20 Sep 2013 13:02:29 -0500 |
| Subject: [PATCH] mm/slab: Don't free locks twice in cpuup_canceled |
| |
| Signed-off-by: Corey Minyard <cminyard@cavium.com> |
| Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
| --- |
| mm/slab.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| diff --git a/mm/slab.c b/mm/slab.c |
| index 494274e..0a3d6d3 100644 |
| --- a/mm/slab.c |
| +++ b/mm/slab.c |
| @@ -1270,7 +1270,6 @@ static void __cpuinit cpuup_canceled(long cpu) |
| free_block(cachep, nc->entry, nc->avail, node); |
| |
| if (!cpumask_empty(mask)) { |
| - local_spin_unlock_irq(slab_lock, &n->list_lock); |
| unlock_l3_and_free_delayed(&n->list_lock); |
| goto free_array_cache; |
| } |
| @@ -1285,7 +1284,6 @@ static void __cpuinit cpuup_canceled(long cpu) |
| alien = n->alien; |
| n->alien = NULL; |
| |
| - local_spin_unlock_irq(slab_lock, &n->list_lock); |
| unlock_l3_and_free_delayed(&n->list_lock); |
| |
| kfree(shared); |
| -- |
| 1.8.4.rc3 |
| |
