diff options
| author | bde <bde@FreeBSD.org> | 1998-07-20 12:37:59 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-07-20 12:37:59 +0000 |
| commit | 6bdff03bd13d386bfcd0b0e7fff6d30b640d8f64 (patch) | |
| tree | 73b2ef6d33ce2fcc2a1a8f89b7e3593437999f4c /sys/kern/subr_diskslice.c | |
| parent | 651bb8e729984374180da8ef5290bcfb12568c68 (diff) | |
| download | FreeBSD-src-6bdff03bd13d386bfcd0b0e7fff6d30b640d8f64.zip FreeBSD-src-6bdff03bd13d386bfcd0b0e7fff6d30b640d8f64.tar.gz | |
Backed out rev.1.43 (removed nonsense SLICE ifdef). SLICE is
normally only defined in opt_devfs.h, so testing it before including
anything is normally a no-op. Undef'ing DEVFS before including
opt_devfs.h is similarly useless. OTOH, DEVFS support for sliced
but not SLICEd (despite defined(SLICE)) devices is either harmless
(if there are no such devices, then nothing in this file is used)
or necessary (otherwise). It even seems to work for sliced cd
devices.
Diffstat (limited to 'sys/kern/subr_diskslice.c')
| -rw-r--r-- | sys/kern/subr_diskslice.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index db12d1d..4dc2343 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -1,6 +1,3 @@ -#ifdef SLICE -#undef DEVFS -#endif /*- * Copyright (c) 1994 Bruce D. Evans. * All rights reserved. @@ -46,7 +43,7 @@ * from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $ * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: subr_diskslice.c,v 1.47 1998/07/04 22:30:22 julian Exp $ + * $Id: subr_diskslice.c,v 1.48 1998/07/11 07:45:42 bde Exp $ */ #include "opt_devfs.h" |
