diff options
| author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
| commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
| tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /mm/slab.c | |
| parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
| parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 3 |
1 files changed, 1 insertions, 2 deletions
| @@ -3992,8 +3992,7 @@ static void cache_reap(struct work_struct *w) | |||
| 3992 | struct kmem_cache *searchp; | 3992 | struct kmem_cache *searchp; |
| 3993 | struct kmem_list3 *l3; | 3993 | struct kmem_list3 *l3; |
| 3994 | int node = numa_node_id(); | 3994 | int node = numa_node_id(); |
| 3995 | struct delayed_work *work = | 3995 | struct delayed_work *work = to_delayed_work(w); |
| 3996 | container_of(w, struct delayed_work, work); | ||
| 3997 | 3996 | ||
| 3998 | if (!mutex_trylock(&cache_chain_mutex)) | 3997 | if (!mutex_trylock(&cache_chain_mutex)) |
| 3999 | /* Give up. Setup the next iteration. */ | 3998 | /* Give up. Setup the next iteration. */ |