diff options
| author | Martin Reindl <martin@cvs.openbsd.org> | 2007-05-15 13:46:23 +0000 |
|---|---|---|
| committer | Martin Reindl <martin@cvs.openbsd.org> | 2007-05-15 13:46:23 +0000 |
| commit | 7d95296f228e0b8befa23f15833ca056cfeeec16 (patch) | |
| tree | 49ef36eadd161e34934d3d07506c88486a20d736 /sys/arch/mac68k | |
| parent | 91ab665a68b179b0f98b8b1f7f700357ff7a711b (diff) | |
switch m68k to __HAVE_CPUINFO
help miod@, art@
ok deraadt@
Diffstat (limited to 'sys/arch/mac68k')
| -rw-r--r-- | sys/arch/mac68k/include/intr.h | 3 | ||||
| -rw-r--r-- | sys/arch/mac68k/mac68k/locore.s | 10 | ||||
| -rw-r--r-- | sys/arch/mac68k/mac68k/trap.c | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/sys/arch/mac68k/include/intr.h b/sys/arch/mac68k/include/intr.h index 0f3f4902e79..6e3d60745b4 100644 --- a/sys/arch/mac68k/include/intr.h +++ b/sys/arch/mac68k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.15 2006/06/11 20:46:50 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.16 2007/05/15 13:46:22 martin Exp $ */ /* $NetBSD: intr.h,v 1.9 1998/08/12 06:58:42 scottr Exp $ */ /* @@ -86,6 +86,7 @@ extern u_short mac68k_statclockipl; #define splstatclock() _splraise(mac68k_statclockipl) #define splserial() _splraise(PSL_S | PSL_IPL4) #define splhigh() _spl(PSL_S | PSL_IPL7) +#define splsched() splhigh() /* These spl calls are _not_ to be used by machine-independent code. */ #define spladb() splhigh() diff --git a/sys/arch/mac68k/mac68k/locore.s b/sys/arch/mac68k/mac68k/locore.s index 6f671cc59e2..16809cabe7d 100644 --- a/sys/arch/mac68k/mac68k/locore.s +++ b/sys/arch/mac68k/mac68k/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.57 2007/03/17 20:05:22 miod Exp $ */ +/* $OpenBSD: locore.s,v 1.58 2007/05/15 13:46:22 martin Exp $ */ /* $NetBSD: locore.s,v 1.103 1998/07/09 06:02:50 scottr Exp $ */ /* @@ -662,7 +662,7 @@ ENTRY_NOPROFILE(trap12) movl d1,sp@- | push length movl a1,sp@- | push addr movl d0,sp@- | push command - movl _C_LABEL(curproc),sp@- | push proc pointer + movl CURPROC,sp@- | push proc pointer jbsr _C_LABEL(cachectl) | do it lea sp@(16),sp | pop args jra _ASM_LABEL(rei) | all done @@ -1013,9 +1013,9 @@ ENTRY(cpu_switch) movl _C_LABEL(curpcb),a0 | current pcb movw sr,a0@(PCB_PS) | save sr before changing ipl #ifdef notyet - movl _C_LABEL(curproc),sp@- | remember last proc running + movl CURPROC,sp@- | remember last proc running #endif - clrl _C_LABEL(curproc) + clrl CURPROC /* * Find the highest-priority queue that isn't empty, @@ -1047,7 +1047,7 @@ Lsw1: bclr d0,d1 | no, clear bit movl d1,_C_LABEL(whichqs) Lsw2: - movl a0,_C_LABEL(curproc) + movl a0,CURPROC clrl _C_LABEL(want_resched) #ifdef notyet movl sp@+,a1 diff --git a/sys/arch/mac68k/mac68k/trap.c b/sys/arch/mac68k/mac68k/trap.c index 434bbeb65aa..16be0b2528a 100644 --- a/sys/arch/mac68k/mac68k/trap.c +++ b/sys/arch/mac68k/mac68k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.53 2007/04/01 09:29:27 art Exp $ */ +/* $OpenBSD: trap.c,v 1.54 2007/05/15 13:46:22 martin Exp $ */ /* $NetBSD: trap.c,v 1.68 1998/12/22 08:47:07 scottr Exp $ */ /* @@ -162,7 +162,7 @@ userret(struct proc *p) /* take pending signals */ while ((sig = CURSIG(p)) != 0) postsig(sig); - curpriority = p->p_priority = p->p_usrpri; + curcpu()->ci_schedstate.spc_curpriority = p->p_priority = p->p_usrpri; } #ifdef M68040 @@ -198,7 +198,7 @@ wb_userret(struct proc *p, struct frame *fp) p->p_priority = p->p_usrpri; } } - curpriority = p->p_priority; + curcpu()->ci_schedstate.spc_curpriority = p->p_priority; } #endif |