diff options
| author | des <des@FreeBSD.org> | 1998-08-23 14:18:08 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 1998-08-23 14:18:08 +0000 |
| commit | db3e7c5e5f1488cd8f6d5f811e5c9ef4d49452d5 (patch) | |
| tree | 0d013a30b71ea14708e9e3df46dd715561746407 | |
| parent | 9ba1aae697b71ae930dfcd9db78b06dcae0e31d7 (diff) | |
| download | FreeBSD-src-db3e7c5e5f1488cd8f6d5f811e5c9ef4d49452d5.zip FreeBSD-src-db3e7c5e5f1488cd8f6d5f811e5c9ef4d49452d5.tar.gz | |
Don't check minor number of dump device at all.
Discussed-with: Jörg Wunsch
| -rw-r--r-- | sys/amd64/amd64/autoconf.c | 6 | ||||
| -rw-r--r-- | sys/i386/i386/autoconf.c | 6 | ||||
| -rw-r--r-- | sys/kern/kern_shutdown.c | 7 |
3 files changed, 3 insertions, 16 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index 01dff04..36461a2 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.101 1998/07/18 21:42:55 des Exp $ + * $Id: autoconf.c,v 1.102 1998/07/19 11:12:14 jkh Exp $ */ /* @@ -418,10 +418,6 @@ setdumpdev(dev) * and nuke dodump sysctl (too many knobs), and move this to * kern_shutdown.c... */ -#ifndef SLICE - if (dkpart(dev) != SWAP_PART) - return (ENODEV); -#endif /* !SLICE */ newdumplo = psize - Maxmem * PAGE_SIZE / DEV_BSIZE; if (newdumplo < 0) return (ENOSPC); diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index 01dff04..36461a2 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.101 1998/07/18 21:42:55 des Exp $ + * $Id: autoconf.c,v 1.102 1998/07/19 11:12:14 jkh Exp $ */ /* @@ -418,10 +418,6 @@ setdumpdev(dev) * and nuke dodump sysctl (too many knobs), and move this to * kern_shutdown.c... */ -#ifndef SLICE - if (dkpart(dev) != SWAP_PART) - return (ENODEV); -#endif /* !SLICE */ newdumplo = psize - Maxmem * PAGE_SIZE / DEV_BSIZE; if (newdumplo < 0) return (ENOSPC); diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 36638c4..eddeb34 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -36,11 +36,10 @@ * SUCH DAMAGE. * * @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94 - * $Id: kern_shutdown.c,v 1.35 1998/08/16 11:27:19 des Exp $ + * $Id: kern_shutdown.c,v 1.36 1998/08/19 20:20:52 des Exp $ */ #include "opt_ddb.h" -#include "opt_devfs.h" #include "opt_hw_wdog.h" #include "opt_panic.h" #include "opt_show_busybufs.h" @@ -355,10 +354,6 @@ dumpsys(void) return; if (dumpdev == NODEV) return; -#ifndef SLICE - if ((minor(dumpdev)&07) != 1) - return; -#endif /* !SLICE */ if (!(bdevsw[major(dumpdev)])) return; if (!(bdevsw[major(dumpdev)]->d_dump)) |
