From 4116f679c7a642cc31488d97a1931da7fc5e8163 Mon Sep 17 00:00:00 2001 From: Brian Feldman Date: Wed, 7 Jul 1999 03:03:59 +0000 Subject: [PATCH] Back out previous commit. It was wrong, and caused panics. --- sys/sys/conf.h | 2 +- sys/sys/linedisc.h | 2 +- sys/vm/vm_swap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/conf.h b/sys/sys/conf.h index b379433cb3bb..f5efabf1e105 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -155,7 +155,7 @@ void ldisc_deregister __P((int)); * Swap device table */ struct swdevt { - udev_t sw_dev; + dev_t sw_dev; int sw_flags; int sw_nblks; struct vnode *sw_vp; diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h index b379433cb3bb..f5efabf1e105 100644 --- a/sys/sys/linedisc.h +++ b/sys/sys/linedisc.h @@ -155,7 +155,7 @@ void ldisc_deregister __P((int)); * Swap device table */ struct swdevt { - udev_t sw_dev; + dev_t sw_dev; int sw_flags; int sw_nblks; struct vnode *sw_vp; diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c index 361a3d9325df..605fabf451aa 100644 --- a/sys/vm/vm_swap.c +++ b/sys/vm/vm_swap.c @@ -314,7 +314,7 @@ swaponvp(p, vp, dev, nblks) nblks = dbtoc(nblks); sp->sw_vp = vp; - sp->sw_dev = dev2udev(dev); + sp->sw_dev = dev; sp->sw_flags |= SW_FREED; sp->sw_nblks = nblks;