diff options
author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1999-02-25 17:27:58 +0000 |
---|---|---|
committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1999-02-25 17:27:58 +0000 |
commit | c0845e77b06ba689031ba8b3944a88310927d453 (patch) | |
tree | 42d9f8f8183374f503d3ac322d742a3e990750e0 /sys/arch/hppa/include/intr.h | |
parent | 6c20cc784bb110138321b30c5d8ba16db8e03857 (diff) |
better __splhigh(); define INT_NONE for 'no ints allowed'
Diffstat (limited to 'sys/arch/hppa/include/intr.h')
-rw-r--r-- | sys/arch/hppa/include/intr.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/hppa/include/intr.h b/sys/arch/hppa/include/intr.h index 301ee34605e..ffdf73770ca 100644 --- a/sys/arch/hppa/include/intr.h +++ b/sys/arch/hppa/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.6 1998/12/23 17:53:54 mickey Exp $ */ +/* $OpenBSD: intr.h,v 1.7 1999/02/25 17:27:57 mickey Exp $ */ /* * Copyright (c) 1990,1991,1992,1994 The University of Utah and @@ -32,6 +32,7 @@ #define CPU_NINTS 32 /* hardwired clock int line */ +#define INT_NONE (0) #define INT_ITMR (0x80000000) #define INT_IO (0x80000000) #define INT_ALL (0xffffffff) @@ -55,9 +56,9 @@ */ #define __splhigh(splhval) ({ \ register u_int _ctl_r; \ - __asm __volatile("mfctl %%cr15,%0\n\t" \ - "mtctl %1,%%cr15\n\t" \ - "rsm %2, %%r0" \ + __asm __volatile("rsm %2, %%r0\n\t" \ + "mfctl %%cr15,%0\n\t" \ + "mtctl %1,%%cr15" \ : "=r" (_ctl_r): "r" (splhval), "i" (PSW_I)); \ _ctl_r; \ }) @@ -90,9 +91,9 @@ #define splbio() __spllow(INT_IO) #define splimp() __spllow(INT_IO) #define spltty() __spllow(INT_IO) -#define splclock() __spllow(0) -#define splstatclock() __spllow(0) -#define splhigh() __splhigh(0) +#define splclock() __spllow(INT_NONE) +#define splstatclock() __spllow(INT_NONE) +#define splhigh() __splhigh(INT_NONE) /* software interrupt register */ extern u_int32_t sir; |