Register lockdep task watcher

[Matt Helsley]

Register a task watcher for lockdep instead of hooking into copy_process().

Signed-off-by: Matt Helsley <[EMAIL PROTECTED]>
---
 kernel/fork.c|5 -
 kernel/lockdep.c |   11 +++
 2 files changed, 11 insertions(+), 5 deletions(-)

Index: linux-2.6.19/kernel/fork.c
===
--- linux-2.6.19.orig/kernel/fork.c
+++ linux-2.6.19/kernel/fork.c
@@ -1059,15 +1059,10 @@ static struct task_struct *copy_process(
p->tgid = current->tgid;
 
retval = notify_task_watchers(WATCH_TASK_INIT, clone_flags, p);
if (retval < 0)
goto bad_fork_cleanup_delays_binfmt;
-#ifdef CONFIG_LOCKDEP
-   p->lockdep_depth = 0; /* no locks held yet */
-   p->curr_chain_key = 0;
-   p->lockdep_recursion = 0;
-#endif
 
 #ifdef CONFIG_DEBUG_MUTEXES
p->blocked_on = NULL; /* not blocked yet */
 #endif
 
Index: linux-2.6.19/kernel/lockdep.c
===
--- linux-2.6.19.orig/kernel/lockdep.c
+++ linux-2.6.19/kernel/lockdep.c
@@ -25,10 +25,11 @@
  * mapping lock dependencies runtime.
  */
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
@@ -2557,10 +2558,20 @@ void __init lockdep_init(void)
INIT_LIST_HEAD(chainhash_table + i);
 
lockdep_initialized = 1;
 }
 
+static int __task_init init_task_lockdep(unsigned long clone_flags,
+struct task_struct *p)
+{
+   p->lockdep_depth = 0; /* no locks held yet */
+   p->curr_chain_key = 0;
+   p->lockdep_recursion = 0;
+   return 0;
+}
+DEFINE_TASK_INITCALL(init_task_lockdep);
+
 void __init lockdep_info(void)
 {
printk("Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., 
Ingo Molnar\n");
 
printk("... MAX_LOCKDEP_SUBCLASSES:%lu\n", MAX_LOCKDEP_SUBCLASSES);

--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Register lockdep task watcher

[Matt Helsley]

Register a task watcher for lockdep instead of hooking into copy_process().

Signed-off-by: Matt Helsley [EMAIL PROTECTED]
---
 kernel/fork.c|5 -
 kernel/lockdep.c |   11 +++
 2 files changed, 11 insertions(+), 5 deletions(-)

Index: linux-2.6.19/kernel/fork.c
===
--- linux-2.6.19.orig/kernel/fork.c
+++ linux-2.6.19/kernel/fork.c
@@ -1059,15 +1059,10 @@ static struct task_struct *copy_process(
p-tgid = current-tgid;
 
retval = notify_task_watchers(WATCH_TASK_INIT, clone_flags, p);
if (retval  0)
goto bad_fork_cleanup_delays_binfmt;
-#ifdef CONFIG_LOCKDEP
-   p-lockdep_depth = 0; /* no locks held yet */
-   p-curr_chain_key = 0;
-   p-lockdep_recursion = 0;
-#endif
 
 #ifdef CONFIG_DEBUG_MUTEXES
p-blocked_on = NULL; /* not blocked yet */
 #endif
 
Index: linux-2.6.19/kernel/lockdep.c
===
--- linux-2.6.19.orig/kernel/lockdep.c
+++ linux-2.6.19/kernel/lockdep.c
@@ -25,10 +25,11 @@
  * mapping lock dependencies runtime.
  */
 #include linux/mutex.h
 #include linux/sched.h
 #include linux/delay.h
+#include linux/init.h
 #include linux/module.h
 #include linux/proc_fs.h
 #include linux/seq_file.h
 #include linux/spinlock.h
 #include linux/kallsyms.h
@@ -2557,10 +2558,20 @@ void __init lockdep_init(void)
INIT_LIST_HEAD(chainhash_table + i);
 
lockdep_initialized = 1;
 }
 
+static int __task_init init_task_lockdep(unsigned long clone_flags,
+struct task_struct *p)
+{
+   p-lockdep_depth = 0; /* no locks held yet */
+   p-curr_chain_key = 0;
+   p-lockdep_recursion = 0;
+   return 0;
+}
+DEFINE_TASK_INITCALL(init_task_lockdep);
+
 void __init lockdep_info(void)
 {
printk(Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., 
Ingo Molnar\n);
 
printk(... MAX_LOCKDEP_SUBCLASSES:%lu\n, MAX_LOCKDEP_SUBCLASSES);

--
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/