From b7c4f523c291bf24c8d4834198502b260ac66af9 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Thu, 10 May 2007 22:22:31 -0700
Subject: [PATCH] --- yaml --- r: 55894 b: refs/heads/master c:
 e1a79c400a86f2f6a6735480e31f6ee159e76fa2 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/um/kernel/init_task.c      | 3 +--
 trunk/arch/um/os-Linux/skas/process.c | 7 +++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 71517fbde9b6..41a2356a49a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57598fd7b31f6437874308a79ca23e51c74da59b
+refs/heads/master: e1a79c400a86f2f6a6735480e31f6ee159e76fa2
diff --git a/trunk/arch/um/kernel/init_task.c b/trunk/arch/um/kernel/init_task.c
index cda91aa8e703..4506c7f32bac 100644
--- a/trunk/arch/um/kernel/init_task.c
+++ b/trunk/arch/um/kernel/init_task.c
@@ -44,8 +44,7 @@ __attribute__((__section__(".data.init_task"))) =
 
 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);
 }
 
 /*
diff --git a/trunk/arch/um/os-Linux/skas/process.c b/trunk/arch/um/os-Linux/skas/process.c
index 6a0e466d01e3..3492886223e1 100644
--- a/trunk/arch/um/os-Linux/skas/process.c
+++ b/trunk/arch/um/os-Linux/skas/process.c
@@ -490,8 +490,8 @@ void map_stub_pages(int fd, unsigned long code,
 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_buf *switch_buf)
 	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);