Synchronize with Lite/2 commit: i386/i386/machdep.c, i386/i386/trap.c,
i386/isa/fd.c and i386/isa/wd.c revisions 1.227, 1.87, 1.96 and 1.123, respectively.
This commit is contained in:
parent
55452e7f59
commit
6ed46f82d8
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=22533
@ -372,7 +372,7 @@ static d_strategy_t fdstrategy;
|
||||
static struct cdevsw fd_cdevsw;
|
||||
static struct bdevsw fd_bdevsw =
|
||||
{ Fdopen, fdclose, fdstrategy, fdioctl, /*2*/
|
||||
nodump, nopsize, 0, "fd", &fd_cdevsw, -1 };
|
||||
nodump, nopsize, D_DISK, "fd", &fd_cdevsw, -1 };
|
||||
|
||||
|
||||
static struct isa_device *fdcdevs[NFDC];
|
||||
|
@ -82,7 +82,7 @@
|
||||
#include <vm/vm.h>
|
||||
#include <vm/vm_param.h>
|
||||
#include <vm/vm_prot.h>
|
||||
#include <vm/lock.h>
|
||||
#include <sys/lock.h>
|
||||
#include <vm/vm_kern.h>
|
||||
#include <vm/vm_object.h>
|
||||
#include <vm/vm_page.h>
|
||||
|
@ -61,7 +61,7 @@
|
||||
#include <vm/vm.h>
|
||||
#include <vm/vm_param.h>
|
||||
#include <vm/vm_prot.h>
|
||||
#include <vm/lock.h>
|
||||
#include <sys/lock.h>
|
||||
#include <vm/pmap.h>
|
||||
#include <vm/vm_kern.h>
|
||||
#include <vm/vm_map.h>
|
||||
|
@ -372,7 +372,7 @@ static d_strategy_t fdstrategy;
|
||||
static struct cdevsw fd_cdevsw;
|
||||
static struct bdevsw fd_bdevsw =
|
||||
{ Fdopen, fdclose, fdstrategy, fdioctl, /*2*/
|
||||
nodump, nopsize, 0, "fd", &fd_cdevsw, -1 };
|
||||
nodump, nopsize, D_DISK, "fd", &fd_cdevsw, -1 };
|
||||
|
||||
|
||||
static struct isa_device *fdcdevs[NFDC];
|
||||
|
@ -82,7 +82,7 @@
|
||||
#include <vm/vm.h>
|
||||
#include <vm/vm_param.h>
|
||||
#include <vm/vm_prot.h>
|
||||
#include <vm/lock.h>
|
||||
#include <sys/lock.h>
|
||||
#include <vm/vm_kern.h>
|
||||
#include <vm/vm_object.h>
|
||||
#include <vm/vm_page.h>
|
||||
|
@ -262,7 +262,7 @@ static d_psize_t wdsize;
|
||||
static struct cdevsw wd_cdevsw;
|
||||
static struct bdevsw wd_bdevsw =
|
||||
{ wdopen, wdclose, wdstrategy, wdioctl, /*0*/
|
||||
wddump, wdsize, 0, "wd", &wd_cdevsw, -1 };
|
||||
wddump, wdsize, D_DISK, "wd", &wd_cdevsw, -1 };
|
||||
|
||||
/*
|
||||
* Probe for controller.
|
||||
|
Loading…
Reference in New Issue
Block a user