diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-01-08 18:10:24 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-01-08 18:10:24 +0000 |
| commit | 87b03074369dfae21d797cf3f96642469441a79c (patch) | |
| tree | a8e8f8249e24d2b359d223f679ca740472256ed7 /sys/arch/powerpc | |
| parent | 36f14486ea394cd56938caae3641b13f676212eb (diff) | |
rename imask[] to cpu_imask[] to because imask is too loud as far as
kernel namespace
ok miod
Diffstat (limited to 'sys/arch/powerpc')
| -rw-r--r-- | sys/arch/powerpc/include/intr.h | 16 | ||||
| -rw-r--r-- | sys/arch/powerpc/powerpc/mutex.S | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h index 955605df495..a8144d3e827 100644 --- a/sys/arch/powerpc/include/intr.h +++ b/sys/arch/powerpc/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.45 2010/12/21 14:56:24 claudio Exp $ */ +/* $OpenBSD: intr.h,v 1.46 2011/01/08 18:10:20 deraadt Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA. @@ -67,7 +67,7 @@ void splx(int); void do_pending_int(void); -extern int imask[IPL_NUM]; +extern int cpu_imask[IPL_NUM]; /* SPL asserts */ #define splassert(wantipl) /* nothing */ @@ -119,12 +119,12 @@ void softintr_schedule(void *); #define SINT_NET SINTMASK(SI_SOFTNET) #define SINT_TTY SINTMASK(SI_SOFTTTY) -#define splbio() splraise(imask[IPL_BIO]) -#define splnet() splraise(imask[IPL_NET]) -#define spltty() splraise(imask[IPL_TTY]) -#define splaudio() splraise(imask[IPL_AUDIO]) -#define splclock() splraise(imask[IPL_CLOCK]) -#define splvm() splraise(imask[IPL_VM]) +#define splbio() splraise(cpu_imask[IPL_BIO]) +#define splnet() splraise(cpu_imask[IPL_NET]) +#define spltty() splraise(cpu_imask[IPL_TTY]) +#define splaudio() splraise(cpu_imask[IPL_AUDIO]) +#define splclock() splraise(cpu_imask[IPL_CLOCK]) +#define splvm() splraise(cpu_imask[IPL_VM]) #define splsched() splhigh() #define spllock() splhigh() #define splstatclock() splhigh() diff --git a/sys/arch/powerpc/powerpc/mutex.S b/sys/arch/powerpc/powerpc/mutex.S index 2b87dae2434..eca21b514d7 100644 --- a/sys/arch/powerpc/powerpc/mutex.S +++ b/sys/arch/powerpc/powerpc/mutex.S @@ -1,4 +1,4 @@ -/* $OpenBSD: mutex.S,v 1.11 2010/09/28 20:27:55 miod Exp $ */ +/* $OpenBSD: mutex.S,v 1.12 2011/01/08 18:10:22 deraadt Exp $ */ /* * Copyright (c) 2007 Dale Rahn @@ -39,9 +39,9 @@ ENTRY(mtx_enter) .L_retry: GET_CPUINFO(%r4) lwz %r5,MTX_WANTIPL(%r3) # load new ipl - lis %r6,_C_LABEL(imask)@ha # convert into cpl + lis %r6,_C_LABEL(cpu_imask)@ha # convert into cpl slwi %r5,%r5,2 - addi %r5,%r5,_C_LABEL(imask)@l + addi %r5,%r5,_C_LABEL(cpu_imask)@l lwzx %r5,%r5,%r6 lwz %r7,CI_CPL(%r4) # load current cpl or %r6,%r5,%r7 # raise cpl @@ -94,9 +94,9 @@ ENTRY(mtx_enter_try) stw %r0,36(%r1) # save return address GET_CPUINFO(%r4) lwz %r5,MTX_WANTIPL(%r3) # load new ipl - lis %r6,_C_LABEL(imask)@ha # convert into cpl + lis %r6,_C_LABEL(cpu_imask)@ha # convert into cpl slwi %r5,%r5,2 - addi %r5,%r5,_C_LABEL(imask)@l + addi %r5,%r5,_C_LABEL(cpu_imask)@l lwzx %r5,%r5,%r6 lwz %r7,CI_CPL(%r4) # load current cpl or %r6,%r5,%r7 # raise cpl |