summaryrefslogtreecommitdiff
path: root/i386/i386/cswitch.S
diff options
context:
space:
mode:
Diffstat (limited to 'i386/i386/cswitch.S')
-rw-r--r--i386/i386/cswitch.S7
1 files changed, 4 insertions, 3 deletions
diff --git a/i386/i386/cswitch.S b/i386/i386/cswitch.S
index 718c8aac..970255a7 100644
--- a/i386/i386/cswitch.S
+++ b/i386/i386/cswitch.S
@@ -29,6 +29,7 @@
#include <i386/proc_reg.h>
#include <i386/i386asm.h>
#include <i386/cpu_number.h>
+.include "i386/cpu_number.S"
/*
* Context switch routines for i386.
@@ -39,7 +40,7 @@ ENTRY(Load_context)
movl TH_KERNEL_STACK(%ecx),%ecx /* get kernel stack */
lea KERNEL_STACK_SIZE-IKS_SIZE-IEL_SIZE(%ecx),%edx
/* point to stack top */
- CPU_NUMBER(%eax)
+ CPU_NUMBER %eax
movl %ecx,CX(EXT(active_stacks),%eax) /* store stack address */
movl %edx,CX(EXT(kernel_stack),%eax) /* store stack top */
@@ -57,7 +58,7 @@ ENTRY(Load_context)
*/
ENTRY(Switch_context)
- CPU_NUMBER(%edx)
+ CPU_NUMBER %edx
movl CX(EXT(active_stacks),%edx),%ecx /* get old kernel stack */
movl %ebx,KSS_EBX(%ecx) /* save registers */
@@ -109,7 +110,7 @@ ENTRY(Thread_continue)
* has no FPU state)
*/
ENTRY(switch_to_shutdown_context)
- CPU_NUMBER(%edx)
+ CPU_NUMBER %edx
movl EXT(active_stacks)(,%edx,4),%ecx /* get old kernel stack */
movl %ebx,KSS_EBX(%ecx) /* save registers */
movl %ebp,KSS_EBP(%ecx)