2 files changed, 59 insertions, 16 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 3c5610ca0c92..6afa72e080cb 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -463,6 +463,10 @@ struct signal_struct {
 #ifdef CONFIG_BSD_PROCESS_ACCT
         struct pacct_struct pacct;      /* per-process accounting information */
 #endif
+#ifdef CONFIG_TASKSTATS
+        spinlock_t stats_lock;
+        struct taskstats *stats;
+#endif
 };
 
 /* Context switch must be unlocked if interrupts are to be enabled */
diff --git a/include/linux/taskstats_kern.h b/include/linux/taskstats_kern.h
index fc9da2e26443..0ae8f67af1fd 100644
--- a/include/linux/taskstats_kern.h
+++ b/include/linux/taskstats_kern.h
@@ -19,36 +19,75 @@ enum {
 extern kmem_cache_t *taskstats_cache;
 extern struct mutex taskstats_exit_mutex;
 
-static inline void taskstats_exit_alloc(struct taskstats **ptidstats,
-                                        struct taskstats **ptgidstats)
+static inline void taskstats_exit_alloc(struct taskstats **ptidstats)
 {
         *ptidstats = kmem_cache_zalloc(taskstats_cache, SLAB_KERNEL);
-        *ptgidstats = kmem_cache_zalloc(taskstats_cache, SLAB_KERNEL);
 }
 
-static inline void taskstats_exit_free(struct taskstats *tidstats,
-                                        struct taskstats *tgidstats)
+static inline void taskstats_exit_free(struct taskstats *tidstats)
 {
         if (tidstats)
                 kmem_cache_free(taskstats_cache, tidstats);
-        if (tgidstats)
-                kmem_cache_free(taskstats_cache, tgidstats);
 }
 
-extern void taskstats_exit_send(struct task_struct *, struct taskstats *,
-                                struct taskstats *);
-extern void taskstats_init_early(void);
+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 signal_struct *sig)
+{
+        struct taskstats *stats;
+        unsigned long flags;
+
+        stats = kmem_cache_zalloc(taskstats_cache, SLAB_KERNEL);
+        if (!stats)
+                return;
+
+        spin_lock_irqsave(&sig->stats_lock, flags);
+        if (!sig->stats) {
+                sig->stats = stats;
+                stats = NULL;
+        }
+        spin_unlock_irqrestore(&sig->stats_lock, flags);
+
+        if (stats)
+                kmem_cache_free(taskstats_cache, stats);
+}
 
+static inline void taskstats_tgid_free(struct signal_struct *sig)
+{
+        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_send(struct task_struct *, struct taskstats *, 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,
-                                        struct taskstats **ptgidstats)
+static inline void taskstats_exit_alloc(struct taskstats **ptidstats)
 {}
-static inline void taskstats_exit_free(struct taskstats *ptidstats,
-                                        struct taskstats *ptgidstats)
+static inline void taskstats_exit_free(struct taskstats *ptidstats)
 {}
 static inline void taskstats_exit_send(struct task_struct *tsk,
-                                        struct taskstats *tidstats,
-                                        struct taskstats *tgidstats)
+                                       struct taskstats *tidstats,
+                                       int group_dead)
+{}
+static inline void taskstats_tgid_init(struct signal_struct *sig)
+{}
+static inline void taskstats_tgid_alloc(struct signal_struct *sig)
+{}
+static inline void taskstats_tgid_free(struct signal_struct *sig)
 {}
 static inline void taskstats_init_early(void)
 {}