From ccbe9cfacc24436000ba2b528714e5b7d6b6b277 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 5 May 2012 15:05:44 +0000
Subject: [PATCH] --- yaml --- r: 302842 b: refs/heads/master c:
 fe844052bca4355bf1a1b078d3e7727800cf3c73 h: refs/heads/master v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/hexagon/include/asm/thread_info.h |  8 -----
 trunk/arch/hexagon/kernel/process.c          | 37 --------------------
 3 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/[refs] b/[refs]
index f3c7922cb43e..087f0294b11c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6e9c540d5d177e7a40d8b40a3b2386bdefbe5da
+refs/heads/master: fe844052bca4355bf1a1b078d3e7727800cf3c73
diff --git a/trunk/arch/hexagon/include/asm/thread_info.h b/trunk/arch/hexagon/include/asm/thread_info.h
index 9c2934ff5756..4f936a7ee847 100644
--- a/trunk/arch/hexagon/include/asm/thread_info.h
+++ b/trunk/arch/hexagon/include/asm/thread_info.h
@@ -31,15 +31,7 @@
 
 #define THREAD_SHIFT		12
 #define THREAD_SIZE		(1<<THREAD_SHIFT)
-
-#if THREAD_SHIFT >= PAGE_SHIFT
 #define THREAD_SIZE_ORDER	(THREAD_SHIFT - PAGE_SHIFT)
-#else  /*  don't use standard allocator  */
-#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
-extern struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node);
-extern void free_thread_info(struct thread_info *ti);
-#endif
-
 
 #ifndef __ASSEMBLY__
 
diff --git a/trunk/arch/hexagon/kernel/process.c b/trunk/arch/hexagon/kernel/process.c
index ff02821bfb7e..af51de63b835 100644
--- a/trunk/arch/hexagon/kernel/process.c
+++ b/trunk/arch/hexagon/kernel/process.c
@@ -233,43 +233,6 @@ unsigned long get_wchan(struct task_struct *p)
 	return 0;
 }
 
-/*
- * Borrowed from PowerPC -- basically allow smaller kernel stacks if we
- * go crazy with the page sizes.
- */
-#if THREAD_SHIFT < PAGE_SHIFT
-
-static struct kmem_cache *thread_info_cache;
-
-struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node)
-{
-	struct thread_info *ti;
-
-	ti = kmem_cache_alloc_node(thread_info_cache, GFP_KERNEL, node);
-	if (unlikely(ti == NULL))
-		return NULL;
-#ifdef CONFIG_DEBUG_STACK_USAGE
-	memset(ti, 0, THREAD_SIZE);
-#endif
-	return ti;
-}
-
-void free_thread_info(struct thread_info *ti)
-{
-	kmem_cache_free(thread_info_cache, ti);
-}
-
-/*  Weak symbol; called by init/main.c  */
-
-void thread_info_cache_init(void)
-{
-	thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
-					      THREAD_SIZE, 0, NULL);
-	BUG_ON(thread_info_cache == NULL);
-}
-
-#endif /* THREAD_SHIFT < PAGE_SHIFT */
-
 /*
  * Required placeholder.
  */