diff options
| author | Mike Travis <travis@sgi.com> | 2008-12-31 20:34:16 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-03 12:53:31 -0500 |
| commit | 7eb19553369c46cc1fa64caf120cbcab1b597f7c (patch) | |
| tree | ef1a3beae706b9497c845d0a2557ceb4d2754998 /lib/debugobjects.c | |
| parent | 6092848a2a23b660150a38bc06f59d75838d70c8 (diff) | |
| parent | 8c384cdee3e04d6194a2c2b192b624754f990835 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask
Conflicts:
arch/x86/kernel/io_apic.c
kernel/rcuclassic.c
kernel/sched.c
kernel/time/tick-sched.c
Signed-off-by: Mike Travis <travis@sgi.com>
[ mingo@elte.hu: backmerged typo fix for io_apic.c ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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) |