From fee512ffc715127b6b945d51628964ce34e52e52 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 3 May 2012 09:02:47 +0000
Subject: [PATCH] --- yaml --- r: 302792 b: refs/heads/master c:
 c6ae063aaf3786b9db7f19a90bf4ed8aaebb7f90 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/frv/include/asm/thread_info.h |  2 --
 trunk/arch/frv/kernel/process.c          | 10 ----------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 83203240d730..d83e3f8d511c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cce4517f33384c3794c759e206cc8e1bb6df146b
+refs/heads/master: c6ae063aaf3786b9db7f19a90bf4ed8aaebb7f90
diff --git a/trunk/arch/frv/include/asm/thread_info.h b/trunk/arch/frv/include/asm/thread_info.h
index 92d83ea99ae5..aaea388a57d9 100644
--- a/trunk/arch/frv/include/asm/thread_info.h
+++ b/trunk/arch/frv/include/asm/thread_info.h
@@ -21,8 +21,6 @@
 
 #define THREAD_SIZE		8192
 
-#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
-
 /*
  * low level task data that entry.S needs immediate access to
  * - this struct should fit entirely inside of one cache line
diff --git a/trunk/arch/frv/kernel/process.c b/trunk/arch/frv/kernel/process.c
index 1ac84b2e5a0f..ed09e9e2c653 100644
--- a/trunk/arch/frv/kernel/process.c
+++ b/trunk/arch/frv/kernel/process.c
@@ -43,16 +43,6 @@ asmlinkage void ret_from_fork(void);
 void (*pm_power_off)(void);
 EXPORT_SYMBOL(pm_power_off);
 
-struct task_struct *alloc_task_struct_node(int node)
-{
-	return kmalloc_node(sizeof(task_struct), GFP_KERNEL, node);
-}
-
-void free_task_struct(struct task_struct *p)
-{
-	kfree(p);
-}
-
 static void core_sleep_idle(void)
 {
 #ifdef LED_DEBUG_SLEEP