diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-12 05:32:03 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-12 05:32:03 -0500 |
| commit | e3ee1e123183ca9847e74b7b8e2694c9e3b817a6 (patch) | |
| tree | 652a84674ed05eaa46a813de2223af0bd0168a5a /lib/debugobjects.c | |
| parent | 5762ba1873b0bb9faa631aaa02f533c2b9837f82 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into timers/hrtimers
Conflicts:
kernel/time/tick-common.c
Diffstat (limited to 'lib/debugobjects.c')
| -rw-r--r-- | lib/debugobjects.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/debugobjects.c b/lib/debugobjects.c index e3ab374e1334..5d99be1fd988 100644 --- a/lib/debugobjects.c +++ b/lib/debugobjects.c | |||
| @@ -45,7 +45,9 @@ static struct kmem_cache *obj_cache; | |||
| 45 | static int debug_objects_maxchain __read_mostly; | 45 | static int debug_objects_maxchain __read_mostly; |
| 46 | static int debug_objects_fixups __read_mostly; | 46 | static int debug_objects_fixups __read_mostly; |
| 47 | static int debug_objects_warnings __read_mostly; | 47 | static int debug_objects_warnings __read_mostly; |
| 48 | static int debug_objects_enabled __read_mostly; | 48 | static int debug_objects_enabled __read_mostly |
| 49 | = CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT; | ||
| 50 | |||
| 49 | static struct debug_obj_descr *descr_test __read_mostly; | 51 | static struct debug_obj_descr *descr_test __read_mostly; |
| 50 | 52 | ||
| 51 | static int __init enable_object_debug(char *str) | 53 | static int __init enable_object_debug(char *str) |