From 1ad3aecd97a6f2aba06cb5f2df1b56a3bb03aa73 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Tue, 26 Sep 2006 10:52:39 +0200 Subject: [PATCH] --- yaml --- r: 35941 b: refs/heads/master c: 7b0bda74f7e77f362eaeee837e7911238acf4c76 h: refs/heads/master i: 35939: 33f03b27ff5f5f50d95172d0060e374a06b9c6a0 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/process.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e8ea83ed02a4..acd0937d8ad5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85691f135db78f3548107a0abe383dfab3bc38fa +refs/heads/master: 7b0bda74f7e77f362eaeee837e7911238acf4c76 diff --git a/trunk/arch/x86_64/kernel/process.c b/trunk/arch/x86_64/kernel/process.c index fba8dfeda67c..885c318f76ab 100644 --- a/trunk/arch/x86_64/kernel/process.c +++ b/trunk/arch/x86_64/kernel/process.c @@ -624,7 +624,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) And the AMD workaround requires it to be after DS reload. */ unlazy_fpu(prev_p); write_pda(kernelstack, - task_stack_page(next_p) + THREAD_SIZE - PDA_STACKOFFSET); + (unsigned long)task_stack_page(next_p) + THREAD_SIZE - PDA_STACKOFFSET); #ifdef CONFIG_CC_STACKPROTECTOR write_pda(stack_canary, next_p->stack_canary); /*