diff options
author | Dale Rahn <drahn@cvs.openbsd.org> | 2004-10-01 15:07:37 +0000 |
---|---|---|
committer | Dale Rahn <drahn@cvs.openbsd.org> | 2004-10-01 15:07:37 +0000 |
commit | 30383e9a19c23204c67e5968f5a5e9eec6d23679 (patch) | |
tree | b81e0176de104afcd000acb84617545580d690ad /sys/arch | |
parent | 57e49a03de9505a0e78b3c554786afa6d9d3b400 (diff) |
Block splsoftclock in splsoftnet, and splsoftclock and splsoftnet in splsofttty
Prevents a race which can corrupt pools, found dhartmei, fix by art and me.
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/powerpc/include/intr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h index ef503b63a68..e8a91416ba4 100644 --- a/sys/arch/powerpc/include/intr.h +++ b/sys/arch/powerpc/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.26 2004/06/28 02:49:10 aaron Exp $ */ +/* $OpenBSD: intr.h,v 1.27 2004/10/01 15:07:36 drahn Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA. @@ -145,8 +145,8 @@ set_sint(int pending) #define splstatclock() splhigh() #define spllowersoftclock() spllower(SINT_CLOCK) #define splsoftclock() splraise(SINT_CLOCK) -#define splsoftnet() splraise(SINT_NET) -#define splsofttty() splraise(SINT_TTY) +#define splsoftnet() splraise(SINT_NET|SINT_CLOCK) +#define splsofttty() splraise(SINT_TTY|SINT_NET|SINT_CLOCK) #define setsoftclock() set_sint(SINT_CLOCK); #define setsoftnet() set_sint(SINT_NET); |