diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:28:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:28:09 -0500 |
| commit | db5e53fbf0abf5cadc83be57032242e5e7c6c394 (patch) | |
| tree | e391aebab8b81a68fe36e5fef8a729062f643259 /lib | |
| parent | 3f4b5c5d275608d42ff54c4981307f9a5c75ea4a (diff) | |
| parent | 3c506efd7e0f615bd9603ce8c06bc4a896952599 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: avoid leaking caches or refcounts on sysfs error
slab: Fix comment on #endif
slab: remove GFP_THISNODE clearing from alloc_slabmgmt()
slub: Add might_sleep_if() to slab_alloc()
SLUB: failslab support
slub: Fix incorrect use of loose
slab: Update the kmem_cache_create documentation regarding the name parameter
slub: make early_kmem_cache_node_alloc void
slab: unsigned slabp->inuse cannot be less than 0
slub - fix get_object_page comment
SLUB: Replace __builtin_return_address(0) with _RET_IP_.
SLUB: cleanup - define macros instead of hardcoded numbers
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index eae594cb6ea9..2e75478e9c69 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -730,6 +730,7 @@ config FAULT_INJECTION | |||
| 730 | config FAILSLAB | 730 | config FAILSLAB |
| 731 | bool "Fault-injection capability for kmalloc" | 731 | bool "Fault-injection capability for kmalloc" |
| 732 | depends on FAULT_INJECTION | 732 | depends on FAULT_INJECTION |
| 733 | depends on SLAB || SLUB | ||
| 733 | help | 734 | help |
| 734 | Provide fault-injection capability for kmalloc. | 735 | Provide fault-injection capability for kmalloc. |
| 735 | 736 | ||