diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-02 16:41:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-02 16:41:36 -0500 |
| commit | 923a789b49c7269a0245d5af6afe486188d940df (patch) | |
| tree | c3f168427372e64f7467a794f313416da5086ba0 /lib/debugobjects.c | |
| parent | 103ceffb9501531f6931df6aebc11a05189201f0 (diff) | |
| parent | b840d79631c882786925303c2b0f4fefc31845ed (diff) | |
Merge branch 'linus' into x86/cleanups
Conflicts:
arch/x86/kernel/reboot.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) |