diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-12-29 04:47:05 -0500 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-12-29 04:47:05 -0500 |
| commit | 3c506efd7e0f615bd9603ce8c06bc4a896952599 (patch) | |
| tree | 6ebc840535e9d93bf60e21e940a5f4558275a89d /lib/Kconfig.debug | |
| parent | fd37617e69fb865348d012eb1413aef0141ae2de (diff) | |
| parent | 773ff60e841461cb1f9374a713ffcda029b8c317 (diff) | |
Merge branch 'topic/failslab' into for-linus
Conflicts:
mm/slub.c
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'lib/Kconfig.debug')
| -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 b0f239e443bc..af65ae7f0549 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -699,6 +699,7 @@ config FAULT_INJECTION | |||
| 699 | config FAILSLAB | 699 | config FAILSLAB |
| 700 | bool "Fault-injection capability for kmalloc" | 700 | bool "Fault-injection capability for kmalloc" |
| 701 | depends on FAULT_INJECTION | 701 | depends on FAULT_INJECTION |
| 702 | depends on SLAB || SLUB | ||
| 702 | help | 703 | help |
| 703 | Provide fault-injection capability for kmalloc. | 704 | Provide fault-injection capability for kmalloc. |
| 704 | 705 | ||