summaryrefslogtreecommitdiff
path: root/sys/arch/sgi
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-12-27 18:31:13 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-12-27 18:31:13 +0000
commit2c83fdf7a5b01f033c7a583c25a774c665b25848 (patch)
tree6c1274fecc59bcb6dfeae362e8697d1c1ef94e32 /sys/arch/sgi
parent1728d3241352f3c138c9ba4ca3293d8875e4bf63 (diff)
Remove unused sw_nblks field of struct swdevt. Then, remove swapconf()
which duplicates work done by uvm_swap_init().
Diffstat (limited to 'sys/arch/sgi')
-rw-r--r--sys/arch/sgi/sgi/autoconf.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/sys/arch/sgi/sgi/autoconf.c b/sys/arch/sgi/sgi/autoconf.c
index 99568a2d8fb..09cdd9c32d5 100644
--- a/sys/arch/sgi/sgi/autoconf.c
+++ b/sys/arch/sgi/sgi/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.10 2005/12/19 21:37:10 miod Exp $ */
+/* $OpenBSD: autoconf.c,v 1.11 2005/12/27 18:31:10 miod Exp $ */
/*
* Copyright (c) 1996 Per Fogelstrom
* Copyright (c) 1995 Theo de Raadt
@@ -61,7 +61,6 @@
struct device *parsedisk(char *, int, int, dev_t *);
void disk_configure(void);
void rootconf(void);
-void swapconf(void);
extern void dumpconf(void);
int findblkmajor(struct device *);
struct device * getdisk(char *, int, int, dev_t *);
@@ -112,31 +111,10 @@ void
disk_configure()
{
rootconf();
- swapconf();
dumpconf();
}
/*
- * Configure swap space and related parameters.
- */
-void
-swapconf()
-{
- struct swdevt *swp;
- int nblks;
-
- for (swp = swdevt; swp->sw_dev != NODEV; swp++) {
- if (bdevsw[major(swp->sw_dev)].d_psize) {
- nblks = (*bdevsw[major(swp->sw_dev)].d_psize)(swp->sw_dev);
- if (nblks != -1 && (swp->sw_nblks == 0 || swp->sw_nblks > nblks)) {
- swp->sw_nblks = nblks;
- }
- swp->sw_nblks = ctod(dtoc(swp->sw_nblks));
- }
- }
-}
-
-/*
* the rest of this file was influenced/copied from Theo de Raadt's
* code in the sparc port to nuke the "options GENERIC" stuff.
*/