2 files changed, 12 insertions, 63 deletions

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index bf35c178a877..a9e8f7e55fd6 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -281,67 +281,6 @@ void show_fpregs(struct user_fp *regs)
 }
 
 /*
- * Task structure and kernel stack allocation.
- */
-struct thread_info_list {
-        unsigned long *head;
-        unsigned int nr;
-};
-
-static DEFINE_PER_CPU(struct thread_info_list, thread_info_list) = { NULL, 0 };
-
-#define EXTRA_TASK_STRUCT       4
-
-struct thread_info *alloc_thread_info(struct task_struct *task)
-{
-        struct thread_info *thread = NULL;
-
-        if (EXTRA_TASK_STRUCT) {
-                struct thread_info_list *th = &get_cpu_var(thread_info_list);
-                unsigned long *p = th->head;
-
-                if (p) {
-                        th->head = (unsigned long *)p[0];
-                        th->nr -= 1;
-                }
-                put_cpu_var(thread_info_list);
-
-                thread = (struct thread_info *)p;
-        }
-
-        if (!thread)
-                thread = (struct thread_info *)
-                           __get_free_pages(GFP_KERNEL, THREAD_SIZE_ORDER);
-
-#ifdef CONFIG_DEBUG_STACK_USAGE
-        /*
-         * The stack must be cleared if you want SYSRQ-T to
-         * give sensible stack usage information
-         */
-        if (thread)
-                memzero(thread, THREAD_SIZE);
-#endif
-        return thread;
-}
-
-void free_thread_info(struct thread_info *thread)
-{
-        if (EXTRA_TASK_STRUCT) {
-                struct thread_info_list *th = &get_cpu_var(thread_info_list);
-                if (th->nr < EXTRA_TASK_STRUCT) {
-                        unsigned long *p = (unsigned long *)thread;
-                        p[0] = (unsigned long)th->head;
-                        th->head = p;
-                        th->nr += 1;
-                        put_cpu_var(thread_info_list);
-                        return;
-                }
-                put_cpu_var(thread_info_list);
-        }
-        free_pages((unsigned long)thread, THREAD_SIZE_ORDER);
-}
-
-/*
  * Free current thread data structures etc..
  */
 void exit_thread(void)
diff --git a/include/asm-arm/thread_info.h b/include/asm-arm/thread_info.h
index f28b236139ed..d9b8bddc8732 100644
--- a/include/asm-arm/thread_info.h
+++ b/include/asm-arm/thread_info.h
@@ -94,8 +94,18 @@ static inline struct thread_info *current_thread_info(void)
         return (struct thread_info *)(sp & ~(THREAD_SIZE - 1));
 }
 
-extern struct thread_info *alloc_thread_info(struct task_struct *task);
-extern void free_thread_info(struct thread_info *);
+/* thread information allocation */
+#ifdef CONFIG_DEBUG_STACK_USAGE
+#define alloc_thread_info(tsk) \
+        ((struct thread_info *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, \
+                THREAD_SIZE_ORDER))
+#else
+#define alloc_thread_info(tsk) \
+        ((struct thread_info *)__get_free_pages(GFP_KERNEL, THREAD_SIZE_ORDER))
+#endif
+
+#define free_thread_info(info) \
+        free_pages((unsigned long)info, THREAD_SIZE_ORDER);
 
 #define thread_saved_pc(tsk)    \
         ((unsigned long)(pc_pointer(task_thread_info(tsk)->cpu_context.pc)))