Locking needs to change a bit.
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
---
mm/slub.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2011-09-02 08:21:28.931219055 -0500
+++ linux-2.6/mm/slub.c 2011-09-02 08:22:38.141218609 -0500
@@ -1781,6 +1781,7 @@ static void deactivate_slab(struct kmem_
int tail = 0;
struct page new;
struct page old;
+ unsigned long uninitialized_var(flags);
if (page->freelist) {
stat(s, DEACTIVATE_REMOTE_FREES);
@@ -1807,7 +1808,7 @@ static void deactivate_slab(struct kmem_
new.inuse--;
VM_BUG_ON(!new.frozen);
- } while (!__cmpxchg_double_slab(s, page,
+ } while (!cmpxchg_double_slab(s, page,
prior, counters,
freelist, new.counters,
"drain percpu freelist"));
@@ -1857,7 +1858,7 @@ redo:
* that acquire_slab() will see a slab page that
* is frozen
*/
- spin_lock(&n->list_lock);
+ spin_lock_irqsave(&n->list_lock, flags);
}
} else {
m = M_FULL;
@@ -1868,7 +1869,7 @@ redo:
* slabs from diagnostic functions will not see
* any frozen slabs.
*/
- spin_lock(&n->list_lock);
+ spin_lock_irqsave(&n->list_lock, flags);
}
}
@@ -1896,14 +1897,14 @@ redo:
}
l = m;
- if (!__cmpxchg_double_slab(s, page,
+ if (!cmpxchg_double_slab(s, page,
old.freelist, old.counters,
new.freelist, new.counters,
"unfreezing slab"))
goto redo;
if (lock)
- spin_unlock(&n->list_lock);
+ spin_unlock_irqrestore(&n->list_lock, flags);
if (m == M_FREE) {
stat(s, DEACTIVATE_EMPTY);
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>