From 6811c16c7c2f8eca16438b5d5ddefb5b6a66d165 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 5 May 2012 15:05:41 +0000
Subject: [PATCH] --- yaml --- r: 302833 b: refs/heads/master c:
 41101809a865dd0be1b56eff46c83fad321870b2 h: refs/heads/master i:   302831:
 7a10e3e1a24f98c48407bd99581c7599e9e7377e v: v3

---
 [refs]              |  2 +-
 trunk/kernel/fork.c | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4d730840db7c..a6953022c2de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2889f60814e15dea644782597d897cdba943564f
+refs/heads/master: 41101809a865dd0be1b56eff46c83fad321870b2
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index 5d22b9b8cf7b..2dfad0269674 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -112,14 +112,26 @@ int nr_processes(void)
 }
 
 #ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
-# define alloc_task_struct_node(node)		\
-		kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node)
-# define free_task_struct(tsk)			\
-		kmem_cache_free(task_struct_cachep, (tsk))
 static struct kmem_cache *task_struct_cachep;
+
+static inline struct task_struct *alloc_task_struct_node(int node)
+{
+	return kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node);
+}
+
+void __weak arch_release_task_struct(struct task_struct *tsk) { }
+
+static inline void free_task_struct(struct task_struct *tsk)
+{
+	arch_release_task_struct(tsk);
+	kmem_cache_free(task_struct_cachep, tsk);
+}
 #endif
 
 #ifndef __HAVE_ARCH_THREAD_INFO_ALLOCATOR
+
+void __weak arch_release_thread_info(struct thread_info *ti) { }
+
 static struct thread_info *alloc_thread_info_node(struct task_struct *tsk,
 						  int node)
 {
@@ -131,6 +143,7 @@ static struct thread_info *alloc_thread_info_node(struct task_struct *tsk,
 
 static inline void free_thread_info(struct thread_info *ti)
 {
+	arch_release_thread_info(ti);
 	free_pages((unsigned long)ti, THREAD_SIZE_ORDER);
 }
 #endif