diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 19:26:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 19:26:57 -0400 |
| commit | 01ba82514603593bb11589e2ea2afdeba1921636 (patch) | |
| tree | c66c762ac6bb98c450e6852aee914e883449c488 /include | |
| parent | ab70a1d7c7fc6665d83f41b5ce790ff8376e0b81 (diff) | |
| parent | 4fdccdfbb4652a7bbac8adbce7449eb093775118 (diff) | |
Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: Add statistics for this_cmpxchg_double failures
slub: Add missing irq restore for the OOM path
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/slub_def.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index 90fbb6d87e11..45ca123e8002 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h | |||
| @@ -32,6 +32,7 @@ enum stat_item { | |||
| 32 | DEACTIVATE_TO_TAIL, /* Cpu slab was moved to the tail of partials */ | 32 | DEACTIVATE_TO_TAIL, /* Cpu slab was moved to the tail of partials */ |
| 33 | DEACTIVATE_REMOTE_FREES,/* Slab contained remotely freed objects */ | 33 | DEACTIVATE_REMOTE_FREES,/* Slab contained remotely freed objects */ |
| 34 | ORDER_FALLBACK, /* Number of times fallback was necessary */ | 34 | ORDER_FALLBACK, /* Number of times fallback was necessary */ |
| 35 | CMPXCHG_DOUBLE_CPU_FAIL,/* Failure of this_cpu_cmpxchg_double */ | ||
| 35 | NR_SLUB_STAT_ITEMS }; | 36 | NR_SLUB_STAT_ITEMS }; |
| 36 | 37 | ||
| 37 | struct kmem_cache_cpu { | 38 | struct kmem_cache_cpu { |