Now that we have UM_THREAD_SIZE, we can replace the calculations in user-space code (an earlier patch took care of the kernel side of the house).
Signed-off-by: Jeff Dike <[EMAIL PROTECTED]> -- arch/um/kernel/init_task.c | 3 +-- arch/um/os-Linux/skas/process.c | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) Index: linux-2.6.21-mm/arch/um/kernel/init_task.c =================================================================== --- linux-2.6.21-mm.orig/arch/um/kernel/init_task.c 2007-05-07 15:01:10.000000000 -0400 +++ linux-2.6.21-mm/arch/um/kernel/init_task.c 2007-05-08 10:06:07.000000000 -0400 @@ -44,8 +44,7 @@ __attribute__((__section__(".data.init_t void unprotect_stack(unsigned long stack) { - os_protect_memory((void *) stack, (1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE, - 1, 1, 0); + os_protect_memory((void *) stack, THREAD_SIZE, 1, 1, 0); } /* Index: linux-2.6.21-mm/arch/um/os-Linux/skas/process.c =================================================================== --- linux-2.6.21-mm.orig/arch/um/os-Linux/skas/process.c 2007-05-07 15:35:31.000000000 -0400 +++ linux-2.6.21-mm/arch/um/os-Linux/skas/process.c 2007-05-08 10:06:07.000000000 -0400 @@ -490,8 +490,8 @@ void map_stub_pages(int fd, unsigned lon void new_thread(void *stack, jmp_buf *buf, void (*handler)(void)) { (*buf)[0].JB_IP = (unsigned long) handler; - (*buf)[0].JB_SP = (unsigned long) stack + - (PAGE_SIZE << UML_CONFIG_KERNEL_STACK_ORDER) - sizeof(void *); + (*buf)[0].JB_SP = (unsigned long) stack + UM_THREAD_SIZE - + sizeof(void *); } #define INIT_JMP_NEW_THREAD 0 @@ -533,8 +533,7 @@ int start_idle_thread(void *stack, jmp_b case INIT_JMP_NEW_THREAD: (*switch_buf)[0].JB_IP = (unsigned long) new_thread_handler; (*switch_buf)[0].JB_SP = (unsigned long) stack + - (PAGE_SIZE << UML_CONFIG_KERNEL_STACK_ORDER) - - sizeof(void *); + UM_THREAD_SIZE - sizeof(void *); break; case INIT_JMP_CALLBACK: (*cb_proc)(cb_arg); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/