diff --git a/[refs] b/[refs]
index 82d8e7e4a7b8..f1faf9bd943f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 803fc74f06cf3cd23417463ca5a176b41717ec19
+refs/heads/master: c64872cd0dd5892f4d6f3605ffca36d13e63443d
diff --git a/trunk/arch/frv/include/asm/thread_info.h b/trunk/arch/frv/include/asm/thread_info.h
index aaea388a57d9..54ab13a0de41 100644
--- a/trunk/arch/frv/include/asm/thread_info.h
+++ b/trunk/arch/frv/include/asm/thread_info.h
@@ -80,19 +80,6 @@ register struct thread_info *__current_thread_info asm("gr15");
 
 #define current_thread_info() ({ __current_thread_info; })
 
-#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
-
-/* thread information allocation */
-#ifdef CONFIG_DEBUG_STACK_USAGE
-#define alloc_thread_info_node(tsk, node)			\
-		kzalloc_node(THREAD_SIZE, GFP_KERNEL, node)
-#else
-#define alloc_thread_info_node(tsk, node)			\
-		kmalloc_node(THREAD_SIZE, GFP_KERNEL, node)
-#endif
-
-#define free_thread_info(info)	kfree(info)
-
 #endif /* __ASSEMBLY__ */
 
 /*