From 3a9ea60f4faccba39927ba9857eb6d2321fad644 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 5 May 2012 15:05:43 +0000 Subject: [PATCH] --- yaml --- r: 302839 b: refs/heads/master c: 803fc74f06cf3cd23417463ca5a176b41717ec19 h: refs/heads/master i: 302837: 1d4cdde67d64e177ab6a19046dce27ba86089071 302835: cf4304b0b0f7d60cdaae02ecffb9ff34ab671982 302831: 7a10e3e1a24f98c48407bd99581c7599e9e7377e v: v3 --- [refs] | 2 +- trunk/arch/cris/include/asm/processor.h | 5 ++--- trunk/arch/cris/include/asm/thread_info.h | 6 ------ 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 1873d58b9961..82d8e7e4a7b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38e7c572ce7310def003d8bb7c34260f5d8118cb +refs/heads/master: 803fc74f06cf3cd23417463ca5a176b41717ec19 diff --git a/trunk/arch/cris/include/asm/processor.h b/trunk/arch/cris/include/asm/processor.h index 4210d72a6667..8dc56ef08712 100644 --- a/trunk/arch/cris/include/asm/processor.h +++ b/trunk/arch/cris/include/asm/processor.h @@ -25,13 +25,12 @@ struct task_struct; */ #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3)) -/* THREAD_SIZE is the size of the task_struct/kernel_stack combo. +/* THREAD_SIZE is the size of the thread_info/kernel_stack combo. * normally, the stack is found by doing something like p + THREAD_SIZE * in CRIS, a page is 8192 bytes, which seems like a sane size */ - #define THREAD_SIZE PAGE_SIZE -#define KERNEL_STACK_SIZE PAGE_SIZE +#define THREAD_SIZE_ORDER (0) /* * At user->kernel entry, the pt_regs struct is stacked on the top of the kernel-stack. diff --git a/trunk/arch/cris/include/asm/thread_info.h b/trunk/arch/cris/include/asm/thread_info.h index 29b92884d793..5b1c448df5c0 100644 --- a/trunk/arch/cris/include/asm/thread_info.h +++ b/trunk/arch/cris/include/asm/thread_info.h @@ -65,12 +65,6 @@ struct thread_info { #define init_thread_info (init_thread_union.thread_info) -#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR -/* thread information allocation */ -#define alloc_thread_info_node(tsk, node) \ - ((struct thread_info *) __get_free_pages(GFP_KERNEL, 1)) -#define free_thread_info(ti) free_pages((unsigned long) (ti), 1) - #endif /* !__ASSEMBLY__ */ /*