--- zzzz-none-000/linux-2.6.19.2/include/linux/taskstats_kern.h	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/include/linux/taskstats_kern.h	2007-01-11 07:38:19.000000000 +0000
@@ -23,26 +23,25 @@
 
 static inline void taskstats_tgid_init(struct signal_struct *sig)
 {
+	spin_lock_init(&sig->stats_lock);
 	sig->stats = NULL;
 }
 
-static inline void taskstats_tgid_alloc(struct task_struct *tsk)
+static inline void taskstats_tgid_alloc(struct signal_struct *sig)
 {
-	struct signal_struct *sig = tsk->signal;
 	struct taskstats *stats;
+	unsigned long flags;
 
-	if (sig->stats != NULL)
-		return;
-
-	/* No problem if kmem_cache_zalloc() fails */
 	stats = kmem_cache_zalloc(taskstats_cache, SLAB_KERNEL);
+	if (!stats)
+		return;
 
-	spin_lock_irq(&tsk->sighand->siglock);
+	spin_lock_irqsave(&sig->stats_lock, flags);
 	if (!sig->stats) {
 		sig->stats = stats;
 		stats = NULL;
 	}
-	spin_unlock_irq(&tsk->sighand->siglock);
+	spin_unlock_irqrestore(&sig->stats_lock, flags);
 
 	if (stats)
 		kmem_cache_free(taskstats_cache, stats);
@@ -50,13 +49,23 @@
 
 static inline void taskstats_tgid_free(struct signal_struct *sig)
 {
-	if (sig->stats)
-		kmem_cache_free(taskstats_cache, sig->stats);
+	struct taskstats *stats = NULL;
+	unsigned long flags;
+
+	spin_lock_irqsave(&sig->stats_lock, flags);
+	if (sig->stats) {
+		stats = sig->stats;
+		sig->stats = NULL;
+	}
+	spin_unlock_irqrestore(&sig->stats_lock, flags);
+	if (stats)
+		kmem_cache_free(taskstats_cache, stats);
 }
 
 extern void taskstats_exit_alloc(struct taskstats **, unsigned int *);
 extern void taskstats_exit_send(struct task_struct *, struct taskstats *, int, unsigned int);
 extern void taskstats_init_early(void);
+extern void taskstats_tgid_alloc(struct signal_struct *);
 #else
 static inline void taskstats_exit_alloc(struct taskstats **ptidstats, unsigned int *mycpu)
 {}
@@ -68,7 +77,7 @@
 {}
 static inline void taskstats_tgid_init(struct signal_struct *sig)
 {}
-static inline void taskstats_tgid_alloc(struct task_struct *tsk)
+static inline void taskstats_tgid_alloc(struct signal_struct *sig)
 {}
 static inline void taskstats_tgid_free(struct signal_struct *sig)
 {}