aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-09-26 04:52:39 -0400
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 04:52:39 -0400
commit7b0bda74f7e77f362eaeee837e7911238acf4c76 (patch)
treec2bfcbee2ad9a8534ab3d9d4107822786ec6d598 /arch/x86_64/kernel
parent85691f135db78f3548107a0abe383dfab3bc38fa (diff)
[PATCH] Fix a PDA warning uncovered by the new type checking
Fix linux/arch/x86_64/kernel/process.c: In function __switch_to: linux/arch/x86_64/kernel/process.c:626: warning: assignment makes integer from pointer without a cast Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel')
-rw-r--r--arch/x86_64/kernel/process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index fba8dfeda67c..885c318f76ab 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -624,7 +624,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
624 And the AMD workaround requires it to be after DS reload. */ 624 And the AMD workaround requires it to be after DS reload. */
625 unlazy_fpu(prev_p); 625 unlazy_fpu(prev_p);
626 write_pda(kernelstack, 626 write_pda(kernelstack,
627 task_stack_page(next_p) + THREAD_SIZE - PDA_STACKOFFSET); 627 (unsigned long)task_stack_page(next_p) + THREAD_SIZE - PDA_STACKOFFSET);
628#ifdef CONFIG_CC_STACKPROTECTOR 628#ifdef CONFIG_CC_STACKPROTECTOR
629 write_pda(stack_canary, next_p->stack_canary); 629 write_pda(stack_canary, next_p->stack_canary);
630 /* 630 /*