diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-03-15 15:22:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-15 15:22:26 -0800 |
| commit | aae898de91bd2396c5933b2674bcaf9b70783763 (patch) | |
| tree | 3c5d18753f9bbcd5ab8ac8ce55371a25bdf8cf87 /include | |
| parent | cd74e1dcb5fd9d6775de1c78f9fd2740d0bdde0c (diff) | |
[PATCH] kill INIT_THREAD_SIZE
From: Matt Mackall <mpm@selenic.com>
This piece of the THREAD_SIZE cleanup got dropped. If you make THREAD_SIZE
> 8k, the init thread overlaps the .init section and gets smashed. I've
gone ahead and killed INIT_THREAD_SIZE throughout as it wasn't doing much.
This also saves 4k when we use 4k stacks. Please apply. Couple more minor
pieces remaining.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm26/thread_info.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc/thread_info.h | 3 | ||||
| -rw-r--r-- | include/asm-um/processor-generic.h | 2 | ||||
| -rw-r--r-- | include/linux/sched.h | 6 |
4 files changed, 1 insertions, 12 deletions
diff --git a/include/asm-arm26/thread_info.h b/include/asm-arm26/thread_info.h index e57f9b2b17b7..bcd0c9c9b6c5 100644 --- a/include/asm-arm26/thread_info.h +++ b/include/asm-arm26/thread_info.h @@ -81,8 +81,6 @@ static inline struct thread_info *current_thread_info(void) /* FIXME - PAGE_SIZE < 32K */ #define THREAD_SIZE (8192) -/*FIXME INIT_THREAD_SIZE - how big? */ -//#define INIT_THREAD_SIZE (65536) #define __get_user_regs(x) (((struct pt_regs *)((unsigned long)(x) + THREAD_SIZE - 8)) - 1) extern struct thread_info *alloc_thread_info(struct task_struct *task); diff --git a/include/asm-sparc/thread_info.h b/include/asm-sparc/thread_info.h index 682f9fca9c53..be8a8f421361 100644 --- a/include/asm-sparc/thread_info.h +++ b/include/asm-sparc/thread_info.h @@ -100,9 +100,6 @@ BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *) * Size of kernel stack for each process. * Observe the order of get_free_pages() in alloc_thread_info(). * The sun4 has 8K stack too, because it's short on memory, and 16K is a waste. - * - * XXX Watch how INIT_THREAD_SIZE evolves in linux/sched.h and elsewhere. - * On 2.5.24 it happens to match 8192 magically. */ #define THREAD_SIZE 8192 diff --git a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h index 61860dc72593..618a49030942 100644 --- a/include/asm-um/processor-generic.h +++ b/include/asm-um/processor-generic.h @@ -94,8 +94,6 @@ struct thread_struct { .request = { 0 } \ } -#define INIT_THREAD_SIZE ((1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE) - typedef struct { unsigned long seg; } mm_segment_t; diff --git a/include/linux/sched.h b/include/linux/sched.h index 72d6edfe401a..d15706883bb6 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -560,13 +560,9 @@ void yield(void); */ extern struct exec_domain default_exec_domain; -#ifndef INIT_THREAD_SIZE -# define INIT_THREAD_SIZE 2048*sizeof(long) -#endif - union thread_union { struct thread_info thread_info; - unsigned long stack[INIT_THREAD_SIZE/sizeof(long)]; + unsigned long stack[THREAD_SIZE/sizeof(long)]; }; #ifndef __HAVE_ARCH_KSTACK_END |