[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070109150615.GF9563@osiris.boeblingen.de.ibm.com>
Date: Tue, 9 Jan 2007 16:06:15 +0100
From: Heiko Carstens <heiko.carstens@...ibm.com>
To: Srivatsa Vaddagiri <vatsa@...ibm.com>
Cc: Benjamin Gilbert <bgilbert@...cmu.edu>,
linux-kernel@...r.kernel.org, Ingo Molnar <mingo@...e.hu>,
Gautham shenoy <ego@...ibm.com>, Andrew Morton <akpm@...l.org>,
Pekka Enberg <penberg@...helsinki.fi>
Subject: [patch -mm] slab: use CPU_LOCK_[ACQUIRE|RELEASE]
From: Heiko Carstens <heiko.carstens@...ibm.com>
Looks like this was forgotten when CPU_LOCK_[ACQUIRE|RELEASE] was
introduced.
Cc: Pekka Enberg <penberg@...helsinki.fi>
Cc: Srivatsa Vaddagiri <vatsa@...ibm.com>
Cc: Gautham Shenoy <ego@...ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@...ibm.com>
---
mm/slab.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
Index: linux-2.6.20-rc3-mm1/mm/slab.c
===================================================================
--- linux-2.6.20-rc3-mm1.orig/mm/slab.c
+++ linux-2.6.20-rc3-mm1/mm/slab.c
@@ -1177,8 +1177,10 @@ static int __cpuinit cpuup_callback(stru
int memsize = sizeof(struct kmem_list3);
switch (action) {
- case CPU_UP_PREPARE:
+ case CPU_LOCK_ACQUIRE:
mutex_lock(&cache_chain_mutex);
+ break;
+ case CPU_UP_PREPARE:
/*
* We need to do this right in the beginning since
* alloc_arraycache's are going to use this list.
@@ -1264,16 +1266,9 @@ static int __cpuinit cpuup_callback(stru
}
break;
case CPU_ONLINE:
- mutex_unlock(&cache_chain_mutex);
start_cpu_timer(cpu);
break;
#ifdef CONFIG_HOTPLUG_CPU
- case CPU_DOWN_PREPARE:
- mutex_lock(&cache_chain_mutex);
- break;
- case CPU_DOWN_FAILED:
- mutex_unlock(&cache_chain_mutex);
- break;
case CPU_DEAD:
/*
* Even if all the cpus of a node are down, we don't free the
@@ -1344,6 +1339,8 @@ free_array_cache:
continue;
drain_freelist(cachep, l3, l3->free_objects);
}
+ break;
+ case CPU_LOCK_RELEASE:
mutex_unlock(&cache_chain_mutex);
break;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists