From 4edad1187dfab1144a6cadc435579f23305d646e Mon Sep 17 00:00:00 2001 From: marcel Date: Mon, 16 Aug 2004 18:54:23 +0000 Subject: Catch up with the drive-by renaming of IA32 to COMPAT_IA32. It must have been rush hour... While here, move COMPAT_IA32 from opt_global.h to opt_compat.h like on amd64. Consequently, it's unsafe to use the option in pcb.h. We now unconditionally have the ia32 specific registers in the PCB. This commit is untested. --- sys/ia64/ia64/machdep.c | 6 +++--- sys/ia64/include/pcb.h | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'sys/ia64') diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c index 2925385..497bd91 100644 --- a/sys/ia64/ia64/machdep.c +++ b/sys/ia64/ia64/machdep.c @@ -322,7 +322,7 @@ cpu_switch(struct thread *old, struct thread *new) struct pcb *oldpcb, *newpcb; oldpcb = old->td_pcb; -#if IA32 +#if COMPAT_IA32 ia32_savectx(oldpcb); #endif if (PCPU_GET(fpcurthread) == old) @@ -332,7 +332,7 @@ cpu_switch(struct thread *old, struct thread *new) oldpcb->pcb_current_pmap = pmap_switch(newpcb->pcb_current_pmap); PCPU_SET(curthread, new); -#if IA32 +#if COMPAT_IA32 ia32_restorectx(newpcb); #endif if (PCPU_GET(fpcurthread) == new) @@ -352,7 +352,7 @@ cpu_throw(struct thread *old __unused, struct thread *new) newpcb = new->td_pcb; (void)pmap_switch(newpcb->pcb_current_pmap); PCPU_SET(curthread, new); -#if IA32 +#if COMPAT_IA32 ia32_restorectx(newpcb); #endif restorectx(newpcb); diff --git a/sys/ia64/include/pcb.h b/sys/ia64/include/pcb.h index d018127..6afe5e6 100644 --- a/sys/ia64/include/pcb.h +++ b/sys/ia64/include/pcb.h @@ -46,7 +46,7 @@ struct pcb { uint64_t pcb_onfault; /* for copy faults */ -#if IA32 + /* IA32 specific registers. */ uint64_t pcb_ia32_cflg; uint64_t pcb_ia32_eflag; uint64_t pcb_ia32_fcr; @@ -66,10 +66,8 @@ void makectx(struct trapframe *, struct pcb *); void restorectx(struct pcb *) __dead2; int swapctx(struct pcb *old, struct pcb *new); -#if IA32 void ia32_restorectx(struct pcb *); void ia32_savectx(struct pcb *); -#endif #endif -- cgit v1.1