Device megapatch 4/6:

Introduce d_version field in struct cdevsw, this must always be
initialized to D_VERSION.

Flip sense of D_NOGIANT flag to D_NEEDGIANT, this involves removing
four D_NOGIANT flags and adding 145 D_NEEDGIANT flags.

13 files changed, 26 insertions, 5 deletions

diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index 8aff8c1..140ae5a 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -197,6 +197,8 @@ static d_poll_t		ascpoll;
 
 
 static struct cdevsw asc_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	ascopen,
 	.d_close =	ascclose,
 	.d_read =	ascread,
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 28adedc..5d18a7b 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -143,6 +143,8 @@ static	d_write_t	ctxwrite;
 static	d_ioctl_t	ctxioctl;
 
 static struct cdevsw ctx_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	ctxopen,
 	.d_close =	ctxclose,
 	.d_read =	ctxread,
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 2a715c0..7207846 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -386,12 +386,13 @@ static	d_write_t	siowrite;
 static	d_ioctl_t	sioioctl;
 
 static struct cdevsw sio_cdevsw = {
+	.d_version =	D_VERSION,
 	.d_open =	sioopen,
 	.d_close =	sioclose,
 	.d_write =	siowrite,
 	.d_ioctl =	sioioctl,
 	.d_name =	driver_name,
-	.d_flags =	D_TTY,
+	.d_flags =	D_TTY | D_NEEDGIANT,
 };
 
 static	int	comconsole = -1;
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index 480448a..0a653fe 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -73,6 +73,8 @@ static	d_write_t	gpwrite;
 static	d_ioctl_t	gpioctl;
 
 static struct cdevsw gp_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	gpopen,
 	.d_close =	gpclose,
 	.d_write =	gpwrite,
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index d4dff76..6cd1122 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -192,6 +192,8 @@ static	d_read_t	gscread;
 static	d_ioctl_t	gscioctl;
 
 static struct cdevsw gsc_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	gscopen,
 	.d_close =	gscclose,
 	.d_read =	gscread,
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index ee82892..f6f10b1 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -643,13 +643,14 @@ COMPAT_ISA_DRIVER(stli, stlidriver);
  */
 
 static struct cdevsw stli_cdevsw = {
+	.d_version =	D_VERSION,
 	.d_open =	stliopen,
 	.d_close =	stliclose,
 	.d_read =	stliread,
 	.d_write =	stliwrite,
 	.d_ioctl =	stliioctl,
 	.d_name =	stli_drvname,
-	.d_flags =	D_TTY,
+	.d_flags =	D_TTY | D_NEEDGIANT,
 };
 
 #endif
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index b2c821b..8cd40f1 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -140,6 +140,8 @@ static  d_ioctl_t	mseioctl;
 static	d_poll_t	msepoll;
 
 static struct cdevsw mse_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	mseopen,
 	.d_close =	mseclose,
 	.d_read =	mseread,
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index af16af9..0b4fdc0 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -93,14 +93,14 @@ static	d_close_t	pcvt_close;
 static	d_ioctl_t	pcvt_ioctl;
 static	d_mmap_t	pcvt_mmap;
 
-
 static struct cdevsw vt_cdevsw = {
+	.d_version =	D_VERSION,
 	.d_open =	pcvt_open,
 	.d_close =	pcvt_close,
 	.d_ioctl =	pcvt_ioctl,
 	.d_mmap =	pcvt_mmap,
 	.d_name =	"vt",
-	.d_flags =	D_TTY,
+	.d_flags =	D_TTY | D_NEEDGIANT,
 };
 
 static int pcvt_probe(device_t dev);
diff --git a/sys/i386/isa/spic.c b/sys/i386/isa/spic.c
index e73b8b6..a649f13 100644
--- a/sys/i386/isa/spic.c
+++ b/sys/i386/isa/spic.c
@@ -85,6 +85,8 @@ static d_ioctl_t	spicioctl;
 static d_poll_t		spicpoll;
 
 static struct cdevsw spic_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	spicopen,
 	.d_close =	spicclose,
 	.d_read =	spicread,
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index dd23abd..b94233a 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -105,6 +105,8 @@ static	d_ioctl_t	spigot_ioctl;
 static	d_mmap_t	spigot_mmap;
 
 static struct cdevsw spigot_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	spigot_open,
 	.d_close =	spigot_close,
 	.d_read =	spigot_read,
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index e82ef46..e73ab8d 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -34,6 +34,8 @@ static	d_write_t	spkrwrite;
 static	d_ioctl_t	spkrioctl;
 
 static struct cdevsw spkr_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	spkropen,
 	.d_close =	spkrclose,
 	.d_write =	spkrwrite,
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index de0b2cc..9a99f74 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -537,11 +537,12 @@ COMPAT_PCI_DRIVER (stlpci, stlpcidriver);
  */
 
 static struct cdevsw stl_cdevsw = {
+	.d_version =	D_VERSION,
 	.d_open =	stlopen,
 	.d_close =	stlclose,
 	.d_ioctl =	stlioctl,
 	.d_name =	"stl",
-	.d_flags =	D_TTY,
+	.d_flags =	D_TTY | D_NEEDGIANT,
 };
 
 #endif
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 941fc08..9ca1e25 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -186,6 +186,8 @@ static	d_strategy_t	wtstrategy;
 
 
 static struct cdevsw wt_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
 	.d_open =	wtopen,
 	.d_close =	wtclose,
 	.d_read =	physread,