diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-03-19 21:10:57 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-03-19 21:10:57 +0000 |
| commit | 169c29d1b708c51bbae3f546e0adfe0d433b5b7b (patch) | |
| tree | 15b32c155eb85259ca3be610962de5f8aa24b91c /sys/arch/i386/include/segments.h | |
| parent | 7aa5f12551d2fef2475152a3a5c9b9961e14b83a (diff) | |
Merging w/ NetBSD 021796.
speaker upgraded to the current.
some changes to the VM stuff (ie kern_thread.c added and so).
Diffstat (limited to 'sys/arch/i386/include/segments.h')
| -rw-r--r-- | sys/arch/i386/include/segments.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/i386/include/segments.h b/sys/arch/i386/include/segments.h index a33824797cd..a1a332e23f3 100644 --- a/sys/arch/i386/include/segments.h +++ b/sys/arch/i386/include/segments.h @@ -1,4 +1,4 @@ -/* $NetBSD: segments.h,v 1.22 1995/12/20 18:09:24 mycroft Exp $ */ +/* $NetBSD: segments.h,v 1.23 1996/02/01 22:31:03 mycroft Exp $ */ /*- * Copyright (c) 1995 Charles M. Hannum. All rights reserved. @@ -70,7 +70,7 @@ #define KERNELMODE(c, f) (ISPL(c) == SEL_KPL) #endif -#ifndef LOCORE +#ifndef _LOCORE #if __GNUC__ == 2 && __GNUC_MINOR__ < 7 #pragma pack(1) @@ -136,7 +136,7 @@ void setsegment __P((struct segment_descriptor *, void *, size_t, int, int, int, int)); #endif /* _KERNEL */ -#endif /* !LOCORE */ +#endif /* !_LOCORE */ /* system segments and gate types */ #define SDT_SYSNULL 0 /* system null */ |