diff options
| author | asami <asami@FreeBSD.org> | 1996-06-14 11:02:28 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1996-06-14 11:02:28 +0000 |
| commit | 36a1932601c730683d263ee933dd90cd6dae96bf (patch) | |
| tree | d76ce0bf0a31500c82596831333ff034e969773b /sys/kern | |
| parent | 5fa995752f02a42fcb2b0ca54149fef141f98060 (diff) | |
| download | FreeBSD-src-36a1932601c730683d263ee933dd90cd6dae96bf.zip FreeBSD-src-36a1932601c730683d263ee933dd90cd6dae96bf.tar.gz | |
The Great PC98 Merge.
All new code is "#ifdef PC98"ed so this should make no difference to
PC/AT (and its clones) users.
Ok'd by: core
Submitted by: FreeBSD(98) development team
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/init_main.c | 9 | ||||
| -rw-r--r-- | sys/kern/vfs_bio.c | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 2a9984e..ffc458b 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $Id: init_main.c,v 1.40 1996/03/11 06:14:38 hsu Exp $ + * $Id: init_main.c,v 1.42 1996/06/11 23:50:48 dyson Exp $ */ #include "opt_rlimit.h" @@ -283,8 +283,15 @@ char copyright[] = "Copyright (c) 1982, 1986, 1989, 1991, 1993\n\tThe Regents of the University of California.\nCopyright (c) 1992 Hewlett-Packard Company\nCopyright (c) 1992 Motorola Inc.\nAll rights reserved.\n\n"; #else char copyright[] = +#ifdef PC98 +"Copyright (c) 1994-1996 FreeBSD(98) porting team.\n" +"Copyright (c) 1982, 1986, 1989, 1991, 1993\n\tThe Regents of the University of California.\n" +"Copyright (c) 1992 A.Kojima F.Ukai M.Ishii (KMC).\n" +"\tAll rights reserved.\n\n"; +#else "Copyright (c) 1982, 1986, 1989, 1991, 1993\n\tThe Regents of the University of California. All rights reserved.\n\n"; #endif +#endif static void print_caddr_t __P((void *data)); static void print_caddr_t(data) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 6b41014..0fc6b7f 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -18,7 +18,7 @@ * 5. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: vfs_bio.c,v 1.91 1996/05/24 05:21:58 dyson Exp $ + * $Id: vfs_bio.c,v 1.92 1996/05/31 00:41:37 dyson Exp $ */ /* @@ -1062,6 +1062,13 @@ loop: splx(s); allocbuf(bp, size); +#ifdef PC98 + /* + * 1024byte/sector support + */ +#define B_XXX2 0x8000000 + if (vp->v_flag & 0x10000) bp->b_flags |= B_XXX2; +#endif return (bp); } } |
