diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2002-02-05 05:12:28 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2002-02-05 05:12:28 +0000 |
| commit | 8003d23058557e9a839576ac230c0cca74bbcd19 (patch) | |
| tree | a7f697dc583df5afd0cb599ba58c8259dc241720 /sys/arch/hppa | |
| parent | 5b549e125de0eae7de2e3ddced4e50ead9305ce9 (diff) | |
redo the spl*() names
Diffstat (limited to 'sys/arch/hppa')
| -rw-r--r-- | sys/arch/hppa/include/intr.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/arch/hppa/include/intr.h b/sys/arch/hppa/include/intr.h index 50d90d5cffc..26c7e01ca1a 100644 --- a/sys/arch/hppa/include/intr.h +++ b/sys/arch/hppa/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.11 2001/06/24 17:05:36 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.12 2002/02/05 05:12:27 mickey Exp $ */ /* * Copyright (c) 1990,1991,1992,1994 The University of Utah and @@ -49,7 +49,7 @@ /* * Define the machine-independent SPL routines in terms of splx(). */ -#define __splhigh(splhval) ({ \ +#define splraise(splhval) ({ \ register u_int _ctl_r; \ __asm __volatile("mfctl %%cr15,%0\n\t" \ "mtctl %1,%%cr15" \ @@ -57,7 +57,7 @@ _ctl_r; \ }) -#define __spllow(spllval) ({ \ +#define spllower(spllval) ({ \ register u_int _ctl_r; \ __asm __volatile("mfctl %%cr15,%0\n\t" \ "mtctl %1,%%cr15" \ @@ -73,19 +73,19 @@ _ctl_r; \ }) -#define spl0() __spllow(IPL_NONE) -#define splsoft() __spllow(IPL_CLOCK) +#define spl0() spllower(IPL_NONE) +#define splsoft() spllower(IPL_CLOCK) #define splsoftnet() splsoft() #define spllowersoftclock() splsoft() #define splsoftclock() splsoft() -#define splbio() __spllow(IPL_BIO) -#define splnet() __spllow(IPL_NET) -#define spltty() __spllow(IPL_TTY) -#define splimp() __spllow(IPL_CLOCK) -#define splclock() __spllow(IPL_CLOCK) -#define splstatclock() __spllow(IPL_CLOCK) -#define splvm() __spllow(IPL_CLOCK) -#define splhigh() __splhigh(IPL_HIGH) +#define splbio() spllower(IPL_BIO) +#define splnet() spllower(IPL_NET) +#define spltty() spllower(IPL_TTY) +#define splimp() spllower(IPL_CLOCK) +#define splclock() spllower(IPL_CLOCK) +#define splstatclock() spllower(IPL_CLOCK) +#define splvm() spllower(IPL_CLOCK) +#define splhigh() splraise(IPL_HIGH) /* software interrupt register */ extern u_int32_t sir; |