diff options
| author | briggs <briggs@cvs.openbsd.org> | 1996-06-23 16:24:09 +0000 |
|---|---|---|
| committer | briggs <briggs@cvs.openbsd.org> | 1996-06-23 16:24:09 +0000 |
| commit | bb4232dad97b11e272586ba1b6636599dbf1c420 (patch) | |
| tree | 99324cddba84c667682ff150f8292a37d468c835 /sys/arch | |
| parent | 252db660a924a3d62fea584d4e2d2b172839dd49 (diff) | |
Sync up with NetBSD.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/mac68k/include/psl.h | 6 | ||||
| -rw-r--r-- | sys/arch/mac68k/mac68k/dpme.h | 4 | ||||
| -rw-r--r-- | sys/arch/mac68k/mac68k/locore.s | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/mac68k/include/psl.h b/sys/arch/mac68k/include/psl.h index dc8e0bec9ce..a0784901bed 100644 --- a/sys/arch/mac68k/include/psl.h +++ b/sys/arch/mac68k/include/psl.h @@ -1,5 +1,5 @@ -/* $OpenBSD: psl.h,v 1.4 1996/05/26 18:36:00 briggs Exp $ */ -/* $NetBSD: psl.h,v 1.9 1996/05/19 04:30:32 briggs Exp $ */ +/* $OpenBSD: psl.h,v 1.5 1996/06/23 16:24:06 briggs Exp $ */ +/* $NetBSD: psl.h,v 1.11 1996/06/21 21:51:15 briggs Exp $ */ #ifndef PSL_C #include <m68k/psl.h> @@ -41,7 +41,7 @@ #define spltty() spl1() /* disallow tty (softserial & ADB) */ #define splbio() spl2() /* disallow block I/O */ #define splnet() spl2() /* disallow network */ -#define splimp() spl2() /* disallow goblins and other nonsense */ +#define splimp() spl2() /* mutual exclusion for memory allocation */ #define splclock() spl2() /* disallow clock (and other) interrupts */ #define splstatclock() spl2() /* ditto */ #define splzs() spl4() /* disallow serial hw interrupts */ diff --git a/sys/arch/mac68k/mac68k/dpme.h b/sys/arch/mac68k/mac68k/dpme.h index 09afc4acd77..1f4dae42a6a 100644 --- a/sys/arch/mac68k/mac68k/dpme.h +++ b/sys/arch/mac68k/mac68k/dpme.h @@ -1,5 +1,5 @@ -/* $OpenBSD: dpme.h,v 1.2 1996/05/26 18:36:17 briggs Exp $ */ -/* $NetBSD: dpme.h,v 1.5 1994/10/26 18:05:48 briggs Exp $ */ +/* $OpenBSD: dpme.h,v 1.3 1996/06/23 16:24:07 briggs Exp $ */ +/* $NetBSD: dpme.h,v 1.6 1996/06/23 15:30:51 briggs Exp $ */ /*- * Copyright (C) 1993 Allen K. Briggs, Chris P. Caputo, diff --git a/sys/arch/mac68k/mac68k/locore.s b/sys/arch/mac68k/mac68k/locore.s index b16fc931af4..cc0c415355e 100644 --- a/sys/arch/mac68k/mac68k/locore.s +++ b/sys/arch/mac68k/mac68k/locore.s @@ -1,5 +1,5 @@ -/* $OpenBSD: locore.s,v 1.10 1996/06/15 21:27:17 briggs Exp $ */ -/* $NetBSD: locore.s,v 1.64 1996/06/09 01:53:42 briggs Exp $ */ +/* $OpenBSD: locore.s,v 1.11 1996/06/23 16:24:08 briggs Exp $ */ +/* $NetBSD: locore.s,v 1.65 1996/06/15 21:25:21 briggs Exp $ */ /* * Copyright (c) 1988 University of Utah. |